diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 331f828b4..e204a8833 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -216,7 +216,6 @@ $null = New-Module {
                                 switch (Get-OneShotTask) {
                                     ([OneShotTask]::InitializeMSAccount) {
                                         Initialize-UserCreation;
-                                        Register-Setup -DefaultUser;
                                     }
                                     ([OneShotTask]::DisableUAC) {
                                         Disable-UAC;
diff --git a/scripts/Windows/Scripts/Users.ps1 b/scripts/Windows/Scripts/Users.ps1
index 6d9a38ca8..12f886f60 100644
--- a/scripts/Windows/Scripts/Users.ps1
+++ b/scripts/Windows/Scripts/Users.ps1
@@ -89,6 +89,7 @@ $null = New-Module {
         if ($msAccount) {
             if (Test-Admin) {
                 Write-Host "Preparing environment for creating MS Account";
+                Register-Setup -DefaultUser;
                 Enable-OneShotListener;
                 Enable-UAC;
                 Restart-Intermediate -CurrentUser;