diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c
index f9aebff2a5e..bc70d65eeb6 100644
--- a/reactos/base/system/winlogon/winlogon.c
+++ b/reactos/base/system/winlogon/winlogon.c
@@ -361,6 +361,10 @@ WinMain(
 	else
 		PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0);
 
+	/* Tell kernel that CurrentControlSet is good (needed
+	 * to support Last good known configuration boot) */
+	NtInitializeRegistry(CM_BOOT_FLAG_ACCEPTED);
+
 	/* Message loop for the SAS window */
 	while (GetMessageW(&Msg, WLSession->SASWindow, 0, 0))
 	{
diff --git a/reactos/base/system/winlogon/winlogon.h b/reactos/base/system/winlogon/winlogon.h
index 09297bd4b27..11860504bcd 100644
--- a/reactos/base/system/winlogon/winlogon.h
+++ b/reactos/base/system/winlogon/winlogon.h
@@ -32,6 +32,7 @@
 #include <windows.h>
 #include <userenv.h>
 #include <winwlx.h>
+#include <cmfuncs.h>
 #include <rtlfuncs.h>
 #include <exfuncs.h>
 #include <setypes.h>