diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index bae045650..59abd27c1 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -58,7 +58,8 @@ export default {
 
         socket.on("autoLogin", (monitorID, data) => {
             this.loggedIn = true;
-            this.storage().token = "autoLogin"
+            this.storage().token = "autoLogin";
+            this.allowLoginDialog = false;
         });
 
         socket.on("monitorList", (data) => {
@@ -166,6 +167,16 @@ export default {
             if (token) {
                 if (token !== "autoLogin") {
                     this.loginByToken(token)
+                } else {
+
+                    // Timeout if it is not actually auto login
+                    setTimeout(() => {
+                        if (! this.loggedIn) {
+                            this.allowLoginDialog = true;
+                            this.$root.storage().removeItem("token");
+                        }
+                    }, 5000);
+
                 }
             } else {
                 this.allowLoginDialog = true;
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 5923e4482..5eaab88b5 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -194,7 +194,7 @@ export default {
         enableAuth() {
             this.settings.disableAuth = false;
             this.saveSettings();
-            this.$root.storage().token = null;
+            this.$root.storage().removeItem("token");
         },
 
     },