diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d0c8950f9e1..96db9c6fc3c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -291,7 +291,7 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
         req.session.login(db, login, password)
-        ctx = req.session.get_context()
+        ctx = req.session.get_context() if req.session._uid else {}
 
         return {
             "session_id": req.session_id,
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 076e91b269c..2e9294ded12 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -486,7 +486,8 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             self.user_context = result.context;
             self.db = result.db;
             self.session_save();
-            self.on_session_valid();
+            if (self.uid)
+                self.on_session_valid();
             return true;
         }).then(success_callback);
     },