diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 14942187..9dd05e7a 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -450,6 +450,7 @@ $null = New-Module {
                                         }
                                         ([UserStage]::Cleanup) {
                                             $user = Get-SetupUser;
+                                            Disable-LocalUser $name;
                                             Enable-LocalUser $user;
                                             Set-AutologinUser $user;
                                             Unregister-WslDistribution;
@@ -460,6 +461,10 @@ $null = New-Module {
                                 }
                             }
 
+                            foreach ($user in $users) {
+                                Enable-LocalUser $user;
+                            }
+
                             Set-IsFinished $true;
                         }
                     }