diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index ca743fad53b..fe071fde55d 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -31,8 +31,7 @@ openerp.auth_signup = function(instance) {
                     return false;
                 });
 
-                var dblist = self.db_list || [];
-                var dbname = self.params.db || (dblist.length === 1 ? dblist[0] : null);
+                var dbname = self.selected_db;
 
                 // if there is an error message in params, show it then forget it
                 if (self.params.error_message) {
diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js
index 10a53418c59..a719a285908 100644
--- a/addons/portal_anonymous/static/src/js/portal_anonymous.js
+++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js
@@ -44,11 +44,10 @@ openerp.portal_anonymous = function(instance) {
         start: function() {
             var self = this;
             return $.when(this._super()).then(function() {
-                var dblist = self.db_list || [];
-                if (!self.session.session_is_valid() && dblist.length === 1 && !(self.params.token || self.params.login)) {
+                if (!self.session.session_is_valid() && !(self.params.token || self.params.login)) {
                     self.remember_credentials = false;
                     // XXX get login/pass from server (via a rpc call) ?
-                    return self.do_login(dblist[0], 'anonymous', 'anonymous');
+                    return self.do_login(self.selected_db, 'anonymous', 'anonymous');
                 }
             });
         },
@@ -68,16 +67,18 @@ openerp.portal_anonymous = function(instance) {
             this.$el.find('a.login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
-                p.$el.find('.oe_leftbar').hide();
-                am.do_action({
-                    type:'ir.actions.client',
-                    tag:'login',
-                    target: 'current',
-                    params: {
-                        login_successful: function() {
-                            am.do_action("reload");
+                p.$el.find('.oe_leftbar, .oe_topbar').hide();
+                self.session.session_logout().done(function () {
+                    am.do_action({
+                        type:'ir.actions.client',
+                        tag:'login',
+                        target: 'current',
+                        params: {
+                            login_successful: function() {
+                                am.do_action("reload");
+                            }
                         }
-                    }
+                    });
                 });
             });
         }