diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index c013a4d..475976b 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -4,7 +4,6 @@
 ; credits: http://www.opsi.org/en/credits/
 
 
-Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
 Set $UninstallProgram$ = $InstallDir$ + "\unins000.exe"
 Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
 
@@ -16,7 +15,8 @@ endif
 Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
 
 if FileExists($IniFile$)
-        Set $UninstallProgramOld$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+        Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
 	if FileExists($UninstallProgramOld$)
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_old
@@ -40,6 +40,7 @@ LinkFolder_uninstall
 
 [Winbatch_uninstall_old]
 "$UninstallProgramOld$" /SILENT /NORESTART /SUPPRESSMSGBOXES
+sleepSeconds 5
 taskkill /F /IM iexplore.exe
 taskkill /F /IM iron.exe
 taskkill /F /IM firefox.exe
@@ -49,6 +50,7 @@ taskkill /F /IM opera.exe
 
 [Winbatch_uninstall]
 "$UninstallProgram$" /SILENT /NORESTART /SUPPRESSMSGBOXES
+sleepSeconds 5
 taskkill /F /IM iexplore.exe
 taskkill /F /IM iron.exe
 taskkill /F /IM firefox.exe
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 4aa0d82..0b47834 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -6,6 +6,7 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
+DefVar $UninstallProg$
 DefVar $UninstallProgram$
 DefVar $UninstallProgramOld$
 DefVar $IniFile$
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index 19ee9c6..8b4b1b1 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -6,6 +6,7 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
+DefVar $UninstallProg$
 DefVar $UninstallProgram$
 DefVar $UninstallProgramOld$
 DefVar $IniFile$