diff --git a/app/contexts/Authentication/Authentication.tsx b/app/contexts/Authentication/Authentication.tsx
index b2851e232e..27d0d7594f 100644
--- a/app/contexts/Authentication/Authentication.tsx
+++ b/app/contexts/Authentication/Authentication.tsx
@@ -20,7 +20,11 @@ export const AuthenticationContext = createContext<{
   authState?: AuthState,
   setAuthState?: Dispatch<SetStateAction<AuthState | undefined>>,
   persistLoginOrOut?: ()=>void,
-  loginAndGetUserInfo?: (usernameOrEmail: string, password:string)=>void;
+  loginAndGetUserInfo?: (
+    usernameOrEmail: string,
+    password:string,
+    failureCallback?:()=>void
+  )=>void;
   logout?: ()=>void;
 }>({});
 
@@ -44,7 +48,7 @@ export const AuthenticationProvider = ({children}:{children:ReactNode})=>{
     });
   }, []);
 
-  const loginAndGetUserInfo = (usernameOrEmail: string, password:string)=>{
+  const loginAndGetUserInfo = (usernameOrEmail: string, password:string, failureCallback?:()=>void)=>{
     CreateSession({usernameOrEmail, password})
       .then((respond)=>{
         GetSession().then((
@@ -56,6 +60,8 @@ export const AuthenticationProvider = ({children}:{children:ReactNode})=>{
               isLoggedIn: true,
               userInfo: res.user
             });
+          }else{
+            if(failureCallback) failureCallback();
           }
         });
       });
diff --git a/app/routes/Login.tsx b/app/routes/Login.tsx
index 28a0d81f31..4843521b2a 100644
--- a/app/routes/Login.tsx
+++ b/app/routes/Login.tsx
@@ -32,7 +32,12 @@ export default function LoginScreen() {
       const password = form.get("password")?.toString();
       if( usernameOrEmail && password && loginAndGetUserInfo){
         setShowLoader("Authenticating");
-        loginAndGetUserInfo(usernameOrEmail, password);
+        loginAndGetUserInfo(
+          usernameOrEmail,
+          password,
+          ()=>{
+            setShowLoader(undefined);
+        });
       }
     }
   }// end handleOnSubmit