diff --git a/client/pages/Login.tsx b/client/pages/Login.tsx
index c672f920..00e27ed2 100644
--- a/client/pages/Login.tsx
+++ b/client/pages/Login.tsx
@@ -83,7 +83,8 @@ export default function Login() {
     }
   };
 
-  if (isLoading) {
+  // Show loading screen only during form submission, not during auth context loading
+  if (isLoading && !loading) {
     return (
       <LoadingScreen
         message="Authenticating your account..."
@@ -93,6 +94,17 @@ export default function Login() {
     );
   }
 
+  // If auth context is still loading, show a different loading state
+  if (loading) {
+    return (
+      <LoadingScreen
+        message="Initializing AeThex OS..."
+        showProgress={true}
+        duration={3000}
+      />
+    );
+  }
+
   return (
     <Layout>
       <div className="min-h-screen bg-aethex-gradient py-12 flex items-center justify-center">