diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 2d566f4a6..cc12fe4fc 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -397,7 +397,12 @@ $null = New-Module {
                                 }
                                 ([UserStage]::Create) {
                                     if ($env:UserName -ne $name) {
-                                        New-ValhallaUser $name;
+                                        $userInfo = @{
+                                            name = $name;
+                                            msAccount = $msAccount;
+                                        };
+
+                                        New-ValhallaUser @userInfo;
 
                                         if ($msAccount) {
                                             logoff;
diff --git a/scripts/Windows/Scripts/Users.ps1 b/scripts/Windows/Scripts/Users.ps1
index d4fa8b0f8..0cf94e586 100644
--- a/scripts/Windows/Scripts/Users.ps1
+++ b/scripts/Windows/Scripts/Users.ps1
@@ -13,10 +13,14 @@ $null = New-Module {
 
         .PARAMETER Name
         The name of the user to create.
+
+        .PARAMETER MSAccount
+        A value indicating whether the user should be created as a Microsoft Account.
     #>
     function New-ValhallaUser {
         param(
-            [string] $Name
+            [string] $Name,
+            [switch] $MSAccount
         )
 
         function Add-MicrosoftAccount {
@@ -84,9 +88,7 @@ $null = New-Module {
             Set-MSAccountName ([string]$newUser);
         }
 
-        $msAccount = Get-UserConfig -UserName $Name "microsoftAccount";
-
-        if ($msAccount) {
+        if ($MSAccount) {
             if (Test-Admin) {
                 Write-Host "Preparing environment for creating MS Account";
                 Register-Setup -DefaultUser;
@@ -105,7 +107,7 @@ $null = New-Module {
 
         Write-Host "Creating personal user ``$Name``…";
 
-        if ($msAccount) {
+        if ($MSAccount) {
             Add-MicrosoftAccount $Name;
             Set-SetupOption $loggedInUserOption $env:UserName;
             Invoke-OneShot ([OneShotTask]::InitializeMSAccount);