diff --git a/scripts/Windows/OS/User.ps1 b/scripts/Windows/OS/User.ps1
index 04eb93f6..aa9e586a 100644
--- a/scripts/Windows/OS/User.ps1
+++ b/scripts/Windows/OS/User.ps1
@@ -42,15 +42,17 @@ function New-PersonalUser([Context] $context)
 
         Write-Information "Disabling Auto login";
         $context.RemoveAutologin();
+        $context.SetStage("DisableUAC");
         Restart-Computer;
         exit;
     }
-    elseif ((Get-LocalUser $context.AdminName))
+    elseif ($context.GetStage() -eq "DisableUAC")
     {
         Enable-PersonalUserAutologon $context;
         Write-Information "Removing Admin Account";
         Get-CimInstance -ClassName "Win32_UserProfile" -Filter "SID = $((Get-LocalUser $context.AdminName).SID)" | Remove-CimInstance;
         $context.RegisterReboot();
+        $context.RemoveStage();
         Write-EventLog -LogName Application -Source "Application" -EventId $taskTrigger -Message "This event was created by $env:Username";
         exit;
     }