diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index 5f21070..993d003 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -149,8 +149,13 @@ export default {
                         baseUrl: baseUrl,
                         idBaseUrl: this.$config.identityServer,
                     });
+                    user.access_token = undefined;
                     user.device_id = tempMatrixClient.getSessionId();
-                    return this.refreshAccessToken(tempMatrixClient, user.refresh_token);
+                    if (user.refresh_token) {
+                        return this.refreshAccessToken(tempMatrixClient, user.refresh_token);
+                    } else {
+                        return Promise.resolve(true);
+                    }
                 }).then(() => {
                     console.log("Refresh done, normal login");
                     return this.login(user, undefined, false, true);