diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 229c741310..cdd4625dbf 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -674,6 +674,7 @@ export default createReactClass({
                     this.state.view !== VIEWS.E2E_SETUP
                 ) {
                     this._onLoggedIn();
+                    ThemeController.isLogin = false;
                 }
                 break;
             case 'on_client_not_viable':
diff --git a/src/theme.js b/src/theme.js
index 774148dacd..442a89e25f 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -70,7 +70,7 @@ export class ThemeWatcher {
         }
     };
 
-    // XXX: forceTheme param aded here as local echo appears to be unreliable
+    // XXX: forceTheme param added here as local echo appears to be unreliable
     // https://github.com/vector-im/riot-web/issues/11443
     recheck(forceTheme) {
         const oldTheme = this._currentTheme;