diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index bd2080c2..ca3aa1b8 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -200,6 +200,7 @@ $null = New-Module {
                                 switch (Get-OneShotTask) {
                                     ([OneShotTask]::InitializeMSAccount) {
                                         Initialize-UserCreation;
+                                        Register-Setup -DefaultUser;
                                     }
                                     ([OneShotTask]::DisableUAC) {
                                         Disable-UAC;
@@ -565,7 +566,6 @@ $null = New-Module {
                                                         New-ValhallaUser $name;
 
                                                         if ($msAccount) {
-                                                            Register-Setup -DefaultUser;
                                                             logoff;
                                                         } else {
                                                             Restart-Intermediate;