diff --git a/scripts/Common/Scripts/Config.ps1 b/scripts/Common/Scripts/Config.ps1
index aab9778c..b33c0b0a 100644
--- a/scripts/Common/Scripts/Config.ps1
+++ b/scripts/Common/Scripts/Config.ps1
@@ -6,6 +6,7 @@ enum SetupStage {
     Initialize
     Configure
     Install
+    CreateUser
 }
 
 $null = New-Module {
diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index b5c958c5..2b004533 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -403,6 +403,9 @@ $null = New-Module {
                     ([SetupStage]::Install) {
                         Write-Host "Entering install phase";
                         Deploy-SoftwareAction;
+                        Set-Stage ([SetupStage]::CreateUser);
+                    }
+                    ([SetupStage]::CreateUser) {
                         Set-IsFinished $true;
                     }
                 }