diff --git a/nlp/admin/web/src/app/core-nlp/auth/login/login.component.css b/nlp/admin/web/src/app/core-nlp/auth/login/login.component.css
index f5295a05b3..852b222c8f 100644
--- a/nlp/admin/web/src/app/core-nlp/auth/login/login.component.css
+++ b/nlp/admin/web/src/app/core-nlp/auth/login/login.component.css
@@ -27,7 +27,7 @@
   font-size: smaller;
   cursor: pointer;
 }
-.error {
+.error-message {
   color: red;
 }
 .success {
diff --git a/nlp/admin/web/src/app/core-nlp/auth/login/login.component.html b/nlp/admin/web/src/app/core-nlp/auth/login/login.component.html
index ab6055cf49..f8a99551a6 100644
--- a/nlp/admin/web/src/app/core-nlp/auth/login/login.component.html
+++ b/nlp/admin/web/src/app/core-nlp/auth/login/login.component.html
@@ -63,10 +63,13 @@
                        id="input-password"
                        placeholder="Password"
                        [required]="true">
-                <ng-container *ngIf="userPassword.invalid && userPassword.touched ">
+                <ng-container *ngIf="errorMessage || (userPassword.invalid && userPassword.touched)">
                   <p class="error-message" *ngIf="userPassword.errors?.required">
                     Password is required!
                   </p>
+                  <p class="error-message" *ngIf="errorMessage">
+                    {{errorMessage}}
+                  </p>
                 </ng-container>
               </div>
               <div class="row">
diff --git a/shared/src/main/kotlin/security/auth/PropertyBasedAuthProvider.kt b/shared/src/main/kotlin/security/auth/PropertyBasedAuthProvider.kt
index 05c0f30612..0ee53907a0 100644
--- a/shared/src/main/kotlin/security/auth/PropertyBasedAuthProvider.kt
+++ b/shared/src/main/kotlin/security/auth/PropertyBasedAuthProvider.kt
@@ -155,7 +155,7 @@ internal object PropertyBasedAuthProvider : TockAuthProvider {
                     resultHandler.handle(Future.succeededFuture(tockUser))
                 }
             }
-            ?: Future.failedFuture<User>("invalid credentials")
+            ?: resultHandler.handle(Future.failedFuture<User>("invalid credentials"))
     }