diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 149cce02..181130c8 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -532,9 +532,12 @@ $null = New-Module {
                                     }
                                 }
 
-                                if (-not (Get-UserConfig -UserName "$user" "microsoftAccount")) {
+                                if (-not $msAccount) {
                                     net user "$user" /logonpasswordchg:yes;
                                 }
+
+                                Set-CurrentUser ($currentUser + 1);
+                                continue;
                             }
 
                             Set-IsFinished $true;