diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 7d284da..a783fdb 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -79,16 +79,13 @@ endif
 
 [Winbatch_install]
 
-xml ed -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ %ScriptPath%\config.xml
-xml ed -u "/Configuration/USERNAME/@Value" -v %HostID% %ScriptPath%\config.xml
-xml ed -u "/Configuration/COMPANYNAME/@Value" -v %HostID% %ScriptPath%\config.xml
-xml ed -u "/Configuration/INSTALLLOCATION/@Value" -v $InstallDir$ %ScriptPath%\config.xml
+xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v $InstallDir$ %ScriptPath%\config.xml > %ScriptPath%\opsiconfig.xml
 
 ; Choose one of the following examples as basis for your installation
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"%ScriptPath%\files\SETUP.EXE" /config "%ScriptPath%\config.xml"
+"%ScriptPath%\files\SETUP.EXE" /config "%ScriptPath%\opsiconfig.xml"
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$