diff --git a/scripts/Windows/OS/Manage.ps1 b/scripts/Windows/OS/Manage.ps1
index c5d87bc6..c3a3c2ca 100644
--- a/scripts/Windows/OS/Manage.ps1
+++ b/scripts/Windows/OS/Manage.ps1
@@ -42,4 +42,5 @@ function Restore-WindowsInstallation([Context] $context) {
     Restore-PersonalFiles $context;
     Restore-PersonalApps $context;
     Remove-Item -Recurse $context.RootDir;
+    $context.Cleanup();
 }
diff --git a/scripts/Windows/Scripts/Context.ps1 b/scripts/Windows/Scripts/Context.ps1
index 4d4c39fb..fccc7928 100644
--- a/scripts/Windows/Scripts/Context.ps1
+++ b/scripts/Windows/Scripts/Context.ps1
@@ -273,4 +273,10 @@ class Context {
         Restart-Computer;
         exit;
     }
+
+    [void] Cleanup() {
+        $this.DeregisterNewUserReboot();
+        $this.RemoveAutologin();
+        Remove-Item $($this.EnsureConfigKey().PSPath);
+    }
 }