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