diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 0a5afa1..a8f7b2a 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -249,14 +249,14 @@ export function App() {
     return <Navigate to="/login" replace />;
   }
 
-  // Production: need setup check
-  if (needsSetup === null) return null;
-
-  // Production mode: if no session, redirect to Authentik sign-in
+  // Show login BEFORE checking needsSetup (needsSetup is never set for unauthenticated users)
   if (!authDisabled && !session) {
     return <LoginPage />;
   }
 
+  // Production: need setup check
+  if (needsSetup === null) return null;
+
   // Redirect to setup wizard if needed
   if (needsSetup) {
     return <Navigate to="/setup" replace />;