diff --git a/src/base-apis.js b/src/base-apis.js
index 6dc9169dd..d00ab64dc 100644
--- a/src/base-apis.js
+++ b/src/base-apis.js
@@ -277,7 +277,21 @@ MatrixBaseApis.prototype.loginWithPassword = function(user, password, callback)
     return this.login("m.login.password", {
         user: user,
         password: password,
-    }, callback);
+    }, (error, response) => {
+        if (response && response.access_token) {
+            this._http.opts.accessToken = response.access_token;
+        }
+
+        if (response && response.user_id) {
+            this.credentials = {
+                userId: response.user_id,
+            };
+        }
+
+        if(callback) {
+            callback(error, response);
+        }
+    });
 };
 
 /**