diff --git a/addons/auth_signup/static/src/js/signup.js b/addons/auth_signup/static/src/js/signup.js
index fc35d689d8a..0e97844c1fa 100644
--- a/addons/auth_signup/static/src/js/signup.js
+++ b/addons/auth_signup/static/src/js/signup.js
@@ -6,9 +6,11 @@ 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"/> ');
+        $('.oe_signup_form').on('submit', function (ev) {
+            var $form = $(ev.currentTarget);
+            var $btn = $form.find('.oe_login_buttons > button[type="submit"]');
+            $btn.attr('disabled', 'disabled');
+            $btn.prepend('<i class="fa fa-refresh fa-spin"/> ');
         });
     }
 });