diff --git a/deployments/server/windows/agent-installer.nsi b/deployments/server/windows/agent-installer.nsi
index 318bdff..4fe9250 100644
--- a/deployments/server/windows/agent-installer.nsi
+++ b/deployments/server/windows/agent-installer.nsi
@@ -14,36 +14,37 @@ Page instfiles
 
 Function nsDialogsPage
 
-	nsDialogs::Create 1018
-	Pop $Dialog
+  nsDialogs::Create 1018
+  Pop $Dialog
 
-	${If} $Dialog == error
-		Abort
-	${EndIf}
+  ${If} $Dialog == error
+          Abort
+  ${EndIf}
 
-	${NSD_CreateLabel} 0 0 100% 12u "Enter your device name provided by the admin here."
-	Pop $Label
+  ${NSD_CreateLabel} 0 0 100% 12u "Enter your device name provided by the admin here."
+  Pop $Label
 
-	${NSD_CreateText} 0 13u 100% 12u $Text
-	Pop $Text
+  ${NSD_CreateText} 0 13u 100% 12u $Text
+  Pop $Text
 
-	nsDialogs::Show
+  nsDialogs::Show
 
 FunctionEnd
 
-
 Function nsDialogsPageLeave
 
   ${NSD_GetText} $Text $0
 
   ; Generate the batch file with the device name
-  FileOpen $4 "$APPDATA\Microsoft\Windows\Start Menu\Programs\Startup\screen-capture-agent.bat" w
-  FileWrite $4 '"$PROGRAMFILES\ScreenCaptureAgent\screen-server.exe" -vhost $0'
-  FileClose $4
+  FileOpen $9 "$APPDATA\Microsoft\Windows\Start Menu\Programs\Startup\screen-capture-agent.bat" w
+  FileWrite $9 "@echo off$\r$\n"
+  FileWrite $9 'START "Screen Capture Agent" "$PROGRAMFILES\ScreenCaptureAgent\screen-server.exe" -vhost $0$\r$\n'
+  FileWrite $9 "exit$\r$\n"
+  FileClose $9
 
 FunctionEnd
 
 Section
   SetOutPath "$PROGRAMFILES\ScreenCaptureAgent"
-  File "screen-client.exe"
+  File "screen-server.exe"
 SectionEnd