diff --git a/builds/install/arch-specific/win32/install_service.bat b/builds/install/arch-specific/win32/install_service.bat
index 0953547a4a..960765ddc5 100644
--- a/builds/install/arch-specific/win32/install_service.bat
+++ b/builds/install/arch-specific/win32/install_service.bat
@@ -1,11 +1,11 @@
 @echo off
-if "%1"=="" (
+if "%~1"=="" (
 instreg install -z
 )
 setlocal
 set INSTALL_SERVICE=install -z
 set START_SERVICE=start
-if not "%1"=="" (
+if not "%~1"=="" (
 set INSTALL_SERVICE=%INSTALL_SERVICE% -n %1
 set START_SERVICE=%START_SERVICE% -n %1
 )
@@ -13,7 +13,7 @@ instsvc %INSTALL_SERVICE%
 instsvc %START_SERVICE%
 endlocal
 @echo.
-@echo Firebird installed and started as a service using 
+@echo Firebird installed and started as a service using
 @echo architecture specified in firebird.conf.
 @echo.
 
diff --git a/builds/install/arch-specific/win32/uninstall_service.bat b/builds/install/arch-specific/win32/uninstall_service.bat
index c9375ca865..8e53d399dd 100644
--- a/builds/install/arch-specific/win32/uninstall_service.bat
+++ b/builds/install/arch-specific/win32/uninstall_service.bat
@@ -2,7 +2,7 @@
 setlocal
 set REMOVE_SERVICE=remove -z
 set STOP_SERVICE=stop
-if not "%1"=="" (
+if not "%~1"=="" (
 set STOP_SERVICE=%STOP_SERVICE% -n %1
 set REMOVE_SERVICE=%REMOVE_SERVICE% -n %1
 )
@@ -10,4 +10,4 @@ instsvc %STOP_SERVICE%
 instsvc %REMOVE_SERVICE%
 endlocal
 
-if "%1"=="" (instreg remove -z)
+if "%~1"=="" (instreg remove -z)