diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c
index 4349f1370fa..a3e828fc65f 100644
--- a/reactos/base/system/winlogon/winlogon.c
+++ b/reactos/base/system/winlogon/winlogon.c
@@ -363,6 +363,9 @@ WinMain(IN HINSTANCE hInstance,
         ExitProcess(1);
     }
 
+    /* Wait for the LSA server */
+    WaitForLsass();
+
     /* Load and initialize gina */
     if (!GinaInit(WLSession))
     {
@@ -374,9 +377,6 @@ WinMain(IN HINSTANCE hInstance,
 
     DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP);
 
-    /* Wait for the LSA server */
-    WaitForLsass();
-
 #if 0
     /* Connect to NetLogon service (lsass.exe) */
     /* Real winlogon uses "Winlogon" */