diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index a6109418b1..6dd19b0c6b 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -62,6 +62,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     } else {
       this._errorMessage = error.message;
     }
+    this._inProgress = false;
   }
 
   ngOnInit() {
@@ -83,7 +84,6 @@ export class LoginComponent implements OnInit, OnDestroy {
 
     this._makeLoginRequest(username, password).subscribe(
       ({ success, error }) => {
-        this._inProgress = false;
         this._handleLoginResponse(success, error, username);
       },
       (err) => {