diff --git a/setup/RunOnce.nsh b/setup/RunOnce.nsh
index b8e8401..3472312 100644
--- a/setup/RunOnce.nsh
+++ b/setup/RunOnce.nsh
@@ -18,9 +18,8 @@
 		System::Call '${GetUserName}(.r0, ${NSIS_MAX_STRLEN}) .r1'
 		${If} ${IsRunOnce}
 		${AndIf} $0 == "SYSTEM"
-			; Running in setup mode. Winlogon will reboot for us.
-			SetErrorLevel ${ERROR_SUCCESS}
-			Quit
+			; Running in setup mode. Reboot is mandatory.
+			Reboot
 		${Else}
 			; Regular reboot.
 			Reboot
@@ -143,13 +142,6 @@ Function RebootIfRequired
 	${Else}
 		; Restore setup keys
 		Call CleanUpRunOnce
-		; Give the user a moment to understand we're rebooting
-		${DetailPrint} "$(StatusRestarting)"
-		Sleep 2000
-		; Now reboot
-		Reboot
-		; To be sure
-		Sleep 10000
 	${EndIf}
 FunctionEnd
 
diff --git a/setup/setup.nsi b/setup/setup.nsi
index fc7dd79..756dc7b 100644
--- a/setup/setup.nsi
+++ b/setup/setup.nsi
@@ -304,7 +304,7 @@ ${MementoSection} "$(SectionRootCerts)" ROOTCERTS
 	${EndIf}
 ${MementoSectionEnd}
 
-${MementoSection} "$(SectionEnableMU)" WIN7MU
+${MementoUnselectedSection} "$(SectionEnableMU)" WIN7MU
 	LegacyUpdateNSIS::EnableMicrosoftUpdate
 	Pop $0
 	${If} $0 != 0