diff --git a/windows/installers/fivem.bat b/windows/installers/fivem.bat
index accfb90..f48b81e 100644
--- a/windows/installers/fivem.bat
+++ b/windows/installers/fivem.bat
@@ -1,4 +1,5 @@
 @ECHO OFF
+SETLOCAL ENABLEDELAYEDEXPANSION
 
 :: Start as administrator
 fltmc >NUL 2>&1 || (
@@ -8,16 +9,18 @@ fltmc >NUL 2>&1 || (
   EXIT 0
 )
 
+SET "fivem=%LOCALAPPDATA%\FiveM"
+MKDIR !fivem! 2>NUL
+
 ECHO FiveM...
 PowerShell -Command "" ^
   "$baselink = 'https://runtime.fivem.net/client';" ^
   "$exe = 'FiveM.exe';" ^
-  "$path = \"$env:LOCALAPPDATA\FiveM\";" ^
-  "$outFile = Join-Path -Path $path -ChildPath $exe;" ^
+  "$outFile = Join-Path -Path '!fivem!' -ChildPath $exe;" ^
   "Invoke-WebRequest -Uri \"https://runtime.fivem.net/client/$exe\" -OutFile $outFile;" ^
   "$WshShell = New-Object -comObject WScript.Shell;" ^
   "$Shortcut = $WshShell.CreateShortcut('%APPDATA%\Microsoft\Windows\Start Menu\Programs\FiveM.lnk');" ^
-  "$Shortcut.WorkingDirectory = \"$path\";" ^
+  "$Shortcut.WorkingDirectory = '!fivem!';" ^
   "$Shortcut.TargetPath = $outFile;" ^
   "$Shortcut.Save()"
 REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\fivem" /f /v DisplayName /t REG_SZ /d "FiveM"