diff --git a/.bin/Scripts/Copy WizardKit.cmd b/.bin/Scripts/Copy WizardKit.cmd
index 00850581..60340710 100644
--- a/.bin/Scripts/Copy WizardKit.cmd	
+++ b/.bin/Scripts/Copy WizardKit.cmd	
@@ -15,7 +15,7 @@ rem Set variables using settings\main.py file
 set "SETTINGS=%bin%\Scripts\settings\main.py"
 for %%v in (ARCHIVE_PASSWORD KIT_NAME_FULL) do (
     set "var=%%v"
-    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" %SETTINGS%`) do (
+    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" "%SETTINGS%"`) do (
         set "_v=%%f"
         set "_v=!_v:*'=!"
         set "%%v=!_v:~0,-1!"
diff --git a/.bin/Scripts/Launch.cmd b/.bin/Scripts/Launch.cmd
index 5d1e1093..2364dcc8 100644
--- a/.bin/Scripts/Launch.cmd
+++ b/.bin/Scripts/Launch.cmd
@@ -22,7 +22,7 @@ rem Set variables using settings\main.py file
 set "SETTINGS=%bin%\Scripts\settings\main.py"
 for %%v in (ARCHIVE_PASSWORD KIT_NAME_FULL OFFICE_SERVER_IP QUICKBOOKS_SERVER_IP) do (
     set "var=%%v"
-    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" %SETTINGS%`) do (
+    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" "%SETTINGS%"`) do (
         set "_v=%%f"
         set "_v=!_v:*'=!"
         set "%%v=!_v:~0,-1!"
@@ -280,9 +280,9 @@ rem Create VB script
 mkdir "%bin%\tmp" 2>nul
 echo Set UAC = CreateObject^("Shell.Application"^) > "%bin%\tmp\Elevate.vbs"
 if defined L_NCMD (
-    echo UAC.ShellExecute "%PYTHON%", "%script%", "", "runas", 3 >> "%bin%\tmp\Elevate.vbs"
+    echo UAC.ShellExecute "%PYTHON%", """%script%""", "", "runas", 3 >> "%bin%\tmp\Elevate.vbs"
 ) else (
-    echo UAC.ShellExecute "%CON%", "-run %PYTHON% %script% -new_console:n", "", "runas", 1 >> "%bin%\tmp\Elevate.vbs"
+    echo UAC.ShellExecute "%CON%", "-run ""%PYTHON%"" ""%script%"" -new_console:n", "", "runas", 1 >> "%bin%\tmp\Elevate.vbs"
 )
 
 rem Run
diff --git a/.bin/Scripts/Launcher_Template.cmd b/.bin/Scripts/Launcher_Template.cmd
index a4b262e0..90b15482 100644
--- a/.bin/Scripts/Launcher_Template.cmd
+++ b/.bin/Scripts/Launcher_Template.cmd
@@ -69,7 +69,7 @@ popd
 :SetTitle
 rem Sets title using KIT_NAME_FULL from settings\main.py
 set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
+for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL "%SETTINGS%"`) do (
     set "_v=%%f"
     set "_v=!_v:*'=!"
     set "KIT_NAME_FULL=!_v:~0,-1!"
diff --git a/.bin/Scripts/init_client_dir.cmd b/.bin/Scripts/init_client_dir.cmd
index 86aedb3f..4d73e7ab 100644
--- a/.bin/Scripts/init_client_dir.cmd
+++ b/.bin/Scripts/init_client_dir.cmd
@@ -27,7 +27,7 @@ set iso_date=%_yyyy%-%_mm%-%_dd%
 
 :SetVars
 set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_SHORT %SETTINGS%`) do (
+for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_SHORT "%SETTINGS%"`) do (
     set "_v=%%f"
     set "_v=!_v:*'=!"
     set "KIT_NAME_SHORT=!_v:~0,-1!"