diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index fe071fde55d..bbaf907c625 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -56,7 +56,7 @@ openerp.auth_signup = function(instance) {
                     self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) {
                         self.signup_enabled = result.signup;
                         self.reset_password_enabled = result.reset_password;
-                        if (self.$("form input[name=login]").val()){
+                        if (!self.signup_enabled || self.$("form input[name=login]").val()){
                             self.set('login_mode', 'default');
                         } else {
                             self.set('login_mode', 'signup');