diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index 95a8a39..31610f0 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -36,6 +36,9 @@ export default class Login extends Vue
             }
             else
             {
+                // Show loading
+                this.disableInput = this.loading = true;
+
                 // Login with token TODO: Logout if expired
                 this.login('/login/token', {token: this.$cookies.get('va.token')});
             }
@@ -99,14 +102,14 @@ export default class Login extends Vue
             {
                 // Show error message & allow user to retry
                 this.error = response.data;
-                this.loading = false;
+                this.disableInput = this.loading = false;
             }
         })
         .catch(err =>
         {
             // Show error message & allow user to retry
             this.error = err;
-            this.loading = false;
+            this.disableInput = this.loading = false;
         });
     }