diff --git a/public/app/core/controllers/login_ctrl.ts b/public/app/core/controllers/login_ctrl.ts
index 1834892a536..a86fb9161dc 100644
--- a/public/app/core/controllers/login_ctrl.ts
+++ b/public/app/core/controllers/login_ctrl.ts
@@ -102,11 +102,11 @@ export class LoginCtrl {
 
     $scope.login = function() {
       delete $scope.loginError;
-      $scope.loggingIn = true;
 
       if (!$scope.loginForm.$valid) {
         return;
       }
+      $scope.loggingIn = true;
 
       backendSrv
         .post('/login', $scope.formModel)