diff --git a/scripts/Windows/OS/User.ps1 b/scripts/Windows/OS/User.ps1
index e67bbd97..f711ae0b 100644
--- a/scripts/Windows/OS/User.ps1
+++ b/scripts/Windows/OS/User.ps1
@@ -28,8 +28,12 @@ function New-PersonalUser([Context] $context)
             }
         }
 
+        Write-Information "Renaming the new User to $($context.UserName)";
         Rename-LocalUser $user $context.UserName;
         Add-LocalGroupMember -Group "Administrators" -Member $user && Set-LocalUser $context.AdminName -Password (ConvertTo-SecureString -AsPlainText "Admin");
-        $context.Reboot();
+
+        Write-Host "Registering setup script for all new users";
+        $context.RegisterNewUserReboot();
+        Register-Reboot;
     }
 }