diff --git a/DEPLOY.BAT b/DEPLOY.BAT
index 37278b0..11bf299 100644
--- a/DEPLOY.BAT
+++ b/DEPLOY.BAT
@@ -262,11 +262,27 @@ IF NOT ERRORLEVEL 1 GOTO MACHINE_EXISTS
 
 :ADD_MACHINE_VAR
 
-REM Append MACHINE variable to AUTOEXEC.BAT
-ECHO SET MACHINE=%MACHINE% >> C:\AUTOEXEC.BAT
-IF ERRORLEVEL 1 GOTO AUTOEXEC_ERROR
+REM Insert MACHINE variable at beginning of AUTOEXEC.BAT (not end!)
+REM This ensures it's set before any scripts or commands run
 
+IF NOT EXIST C:\AUTOEXEC.BAT GOTO CREATE_NEW_AUTOEXEC
+
+REM AUTOEXEC.BAT exists - insert SET MACHINE at line 2 (after @ECHO OFF)
+ECHO @ECHO OFF > C:\AUTOEXEC.TMP
+ECHO SET MACHINE=%MACHINE% >> C:\AUTOEXEC.TMP
+TYPE C:\AUTOEXEC.BAT | FIND /V "@ECHO OFF" >> C:\AUTOEXEC.TMP
+COPY C:\AUTOEXEC.TMP C:\AUTOEXEC.BAT >NUL
+DEL C:\AUTOEXEC.TMP
+GOTO MACHINE_ADD_DONE
+
+:CREATE_NEW_AUTOEXEC
+REM No AUTOEXEC.BAT exists - create new one
+ECHO @ECHO OFF > C:\AUTOEXEC.BAT
+ECHO SET MACHINE=%MACHINE% >> C:\AUTOEXEC.BAT
+
+:MACHINE_ADD_DONE
 ECHO [OK] Added to AUTOEXEC.BAT: SET MACHINE=%MACHINE%
+ECHO     (Inserted at beginning, before other commands)
 ECHO.
 GOTO INSTALL_BATCH_FILES