diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 72ab85ada32..f8c493a572b 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -7,31 +7,29 @@ openerp.auth_signup = function(instance) {
             this._super.apply(this, arguments);
             this.signup_enabled = false;
             this.reset_password_enabled = false;
-            this.on('change:login-mode', this, function() {
-                /*
-                 * Switches the login box to the select mode
-                 * whith mode == [default|signup|reset]
-                 */
-                var self = this;
-                var mode = this.get('login-mode') || 'default';
-                self.$('*[data-modes]').each(function() {
-                    var modes = $(this).data('modes').split(/\s+/);
-                    $(this).toggle(modes.indexOf(mode) > -1);
-                });
-                self.$('a.oe_signup_signup:visible').toggle(this.signup_enabled);
-                self.$('a.oe_signup_reset_password:visible').toggle(this.reset_password_enabled);
-            });
         },
         start: function() {
             var self = this;
             return this._super().then(function() {
+
+                // Switches the login box to the select mode whith mode == [default|signup|reset]
+                self.on('change:login_mode', self, function() {
+                    var mode = self.get('login_mode') || 'default';
+                    self.$('*[data-modes]').each(function() {
+                        var modes = $(this).data('modes').split(/\s+/);
+                        $(this).toggle(modes.indexOf(mode) > -1);
+                    });
+                    self.$('a.oe_signup_signup:visible').toggle(self.signup_enabled);
+                    self.$('a.oe_signup_reset_password:visible').toggle(self.reset_password_enabled);
+                });
+
                 // to switch between the signup and regular login form
                 self.$('a.oe_signup_signup').click(function(ev) {
-                    self.set('login-mode', 'signup');
+                    self.set('login_mode', 'signup');
                     return false;
                 });
                 self.$('a.oe_signup_back').click(function(ev) {
-                    self.set('login-mode', 'default');
+                    self.set('login_mode', 'default');
                     delete self.params.token;
                     return false;
                 });
@@ -62,11 +60,11 @@ 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;
-                        self.set('login-mode', 'default');
+                        self.set('login_mode', 'default');
                     });
                 } else {
                     // TODO: support multiple database mode
-                    self.set('login-mode', 'default');
+                    self.set('login_mode', 'default');
                 }
             });
         },
@@ -77,7 +75,7 @@ openerp.auth_signup = function(instance) {
             this.on_db_loaded([result.db]);
             if (result.token) {
                 // switch to signup mode, set user name and login
-                this.set('login-mode', (this.params.type === 'reset' ? 'reset' : 'signup'));
+                this.set('login_mode', (this.params.type === 'reset' ? 'reset' : 'signup'));
                 this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
                 if (result.login) {
                     this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");
@@ -87,7 +85,7 @@ openerp.auth_signup = function(instance) {
             } else {
                 // remain in login mode, set login if present
                 delete this.params.token;
-                this.set('login-mode', 'default');
+                this.set('login_mode', 'default');
                 this.$("form input[name=login]").val(result.login || "");
             }
         },
@@ -99,14 +97,14 @@ openerp.auth_signup = function(instance) {
             this.show_error(_t("Invalid signup token"));
             delete this.params.db;
             delete this.params.token;
-            this.set('login-mode', 'default');
+            this.set('login_mode', 'default');
         },
 
         on_submit: function(ev) {
             if (ev) {
                 ev.preventDefault();
             }
-            var login_mode = this.get('login-mode');
+            var login_mode = this.get('login_mode');
             if (login_mode === 'signup' || login_mode === 'reset') {
                 // signup user (or reset password)
                 var db = this.$("form [name=db]").val();
@@ -170,7 +168,7 @@ openerp.auth_signup = function(instance) {
             }
             return self.rpc("/auth_signup/reset_password", { dbname: db, login: login }).done(function(result) {
                 self.show_error(_t("An email has been sent with credentials to reset your password"));
-                self.set('login-mode', 'default');
+                self.set('login_mode', 'default');
             }).fail(function(result, ev) {
                 ev.preventDefault();
                 self.show_error(result.message);