diff --git a/artiq-fast/windows/autounattend.nix b/artiq-fast/windows/autounattend.nix
index 5853a6b..0e99339 100644
--- a/artiq-fast/windows/autounattend.nix
+++ b/artiq-fast/windows/autounattend.nix
@@ -267,6 +267,14 @@ let
     </AutoLogon>
   ''}
 
+          <FirstLogonCommands>
+            <SynchronousCommand wcm:action="add">
+              <Order>1</Order>
+              <CommandLine>cmd /C shutdown /s /f /t 00</CommandLine>
+              <Description>ChangeHideFiles</Description>
+            </SynchronousCommand>
+          </FirstLogonCommands>
+
         </component>
       </settings>
 
diff --git a/artiq-fast/windows/bundle/main.go b/artiq-fast/windows/bundle/main.go
index a69e544..772bf79 100644
--- a/artiq-fast/windows/bundle/main.go
+++ b/artiq-fast/windows/bundle/main.go
@@ -84,16 +84,7 @@ func InstallBundle(bundlePath string) error {
 	return err
 }
 
-func Shutdown() {
-	if err := exec.Command("cmd", "/C", "shutdown", "/s", "/f", "/t", "00").Run(); err != nil {
-		fmt.Println("Failed to initiate shutdown:", err)
-	}
-}
-
 func main() {
-
-	defer Shutdown()
-
 	// Get path relative to binary
 	baseDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 	if err != nil {