diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c
index c846d05ca52..975acce1592 100644
--- a/base/system/winlogon/sas.c
+++ b/base/system/winlogon/sas.c
@@ -1542,6 +1542,7 @@ SASWindowProc(
         {
             if (!GetSetupType())
                 UnregisterHotKeys(Session, hwndDlg);
+            PostQuitMessage(0);
             return TRUE;
         }
         case WM_SETTINGCHANGE:
diff --git a/base/system/winlogon/winlogon.c b/base/system/winlogon/winlogon.c
index 480272ac80a..8500560f4d4 100644
--- a/base/system/winlogon/winlogon.c
+++ b/base/system/winlogon/winlogon.c
@@ -614,6 +614,7 @@ WinMain(
     CleanupNotifications();
 
     /* We never go there */
-
+    // TODO: Shutdown if we are in session 0, otherwise let the process terminate.
+    SleepEx(INFINITE, FALSE);
     return 0;
 }