diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index 4aa4ef77662..bf3c9d64c81 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/addons/auth_signup/__manifest__.py
@@ -20,6 +20,7 @@ Allow users to sign up and reset their password
         'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/auth_signup_login_templates.xml',
+        'views/auth_signup_assets.xml',
     ],
     'bootstrap': True,
 }
diff --git a/addons/auth_signup/static/src/js/signup.js b/addons/auth_signup/static/src/js/signup.js
new file mode 100644
index 00000000000..fc35d689d8a
--- /dev/null
+++ b/addons/auth_signup/static/src/js/signup.js
@@ -0,0 +1,16 @@
+odoo.define('auth_signup.signup', function (require) {
+    'use strict';
+
+var base = require('web_editor.base');
+
+base.ready().then(function() {
+    // Disable 'Sign Up' button to prevent user form continuous clicking
+    if ($('.oe_signup_form').length > 0) {
+        $('.oe_signup_form').on('submit', function () {
+            $('.o_signup_btn').attr('disabled', 'disabled');
+            $('.o_signup_btn').prepend('<i class="fa fa-refresh fa-spin"/> ');
+        });
+    }
+});
+
+});
diff --git a/addons/auth_signup/views/auth_signup_assets.xml b/addons/auth_signup/views/auth_signup_assets.xml
new file mode 100644
index 00000000000..23a1e01cf17
--- /dev/null
+++ b/addons/auth_signup/views/auth_signup_assets.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Auth Assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/auth_signup/static/src/js/signup.js"></script>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/auth_signup/views/auth_signup_login_templates.xml b/addons/auth_signup/views/auth_signup_login_templates.xml
index a38596abe9c..46fee5ea375 100644
--- a/addons/auth_signup/views/auth_signup_login_templates.xml
+++ b/addons/auth_signup/views/auth_signup_login_templates.xml
@@ -50,7 +50,7 @@
                     <input type="hidden" name="token" t-att-value="token"/>
                     <div class="clearfix oe_login_buttons">
                         <a t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link pull-right">Already have an account?</a>
-                        <button type="submit" class="btn btn-primary pull-left">Sign up</button>
+                        <button type="submit" class="btn btn-primary pull-left o_signup_btn"> Sign up</button>
                     </div>
 
                 </form>