diff --git a/CLIENT_DATA/control3264.ins b/CLIENT_DATA/control3264.ins
index 03f456e..cdfcca3 100644
--- a/CLIENT_DATA/control3264.ins
+++ b/CLIENT_DATA/control3264.ins
@@ -18,6 +18,8 @@ endif
 DefVar	$MSVersion$
 Set 	$MSVersion$ = GetMsVersionInfo
 
+DefVar	$java_reinstall$
+Set	$java_reinstall$ = GetProductProperty("java_reinstall", "1")
 
 DefVar	$timer_value$
 Set 	$timer_value$ = GetProductProperty("timer_value", "40")
@@ -32,7 +34,7 @@ Set 	$dotnet3.0$ = GetProductProperty("dotnet3.0", "install")
 DefVar	$dotnet3.5$
 Set 	$dotnet3.5$ = GetProductProperty("dotnet3.5", "install")
 DefVar	$dotnet4.0$
-Set 	$dotnet4.0$ = GetProductProperty("dotnet4.0", "install")
+Set 	$dotnet4.0$ = GetProductProperty("dotnet4.0", "none")
 DefVar	$dotnet4.5$
 Set 	$dotnet4.5$ = GetProductProperty("dotnet4.5", "install")
 DefVar	$msjsharp$
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 85034e3..1140e83 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -83,7 +83,10 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_jre_uninstall
+		if ($java_reinstall$ = "1")
+		    Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
+		    Winbatch_jre_uninstall
+		endif
 		Dosbatch_install_32
 		Sub_check_exitcode
 		comment "Copy files"
@@ -98,7 +101,10 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_jre_uninstall
+		if ($java_reinstall$ = "1")
+		    Message "Uninstalling " + "Java" + " 32 + 64 Bit..."
+		    Winbatch_jre_uninstall
+		endif
 		Dosbatch_install_64
 		Sub_check_exitcode
 		comment "Copy files"
diff --git a/OPSI/control b/OPSI/control
index dc2b459..6d79c11 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -42,6 +42,15 @@ requiredProduct: horstmuc.inifile
 requiredStatus: installed
 requirementType: before
 
+[ProductProperty]
+type: unicode
+name: java_reinstall
+multivalue: False
+editable: False
+description: Remove all versions of Java and install the latest version (from sereby packet)
+values: ["0", "1"]
+default: ["1"]
+
 [ProductProperty]
 type: unicode
 name: timer_value
@@ -105,7 +114,7 @@ multivalue: False
 editable: False
 description: Install Microsoft Netframework 4.0
 values: ["install", "none"]
-default: ["install"]
+default: ["none"]
 
 [ProductProperty]
 type: unicode