diff --git a/utils/RUN_Adempiere.sh b/utils/RUN_Adempiere.sh
index 2a63ce5df3..4a4d0182c1 100644
--- a/utils/RUN_Adempiere.sh
+++ b/utils/RUN_Adempiere.sh
@@ -28,17 +28,18 @@ else
 fi
 
 
-# To switch between multiple installs, copy the created Adempiere.properties file
-# Select the configuration by setting the PROP variable
-PROP=
-#PROP=-DPropertyFile=test.properties
+# Check Argument
+if [ $1 ]; then
+	PROP=-DPropertyFile=$1
+else
+	PROP=
+fi
 
 #  To use your own Encryption class (implementing org.compiere.util.SecureInterface),
 #  you need to set it here (and in the server start script) - example:
 #  SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure
 SECURE=
 
-#$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -classpath $CLASSPATH org.compiere.Adempiere
 # OSGi:
-$JAVA -Xms32m -Xmx512m -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -install $ADEMPIERE_HOME/osgi -configuration $ADEMPIERE_HOME/osgi/client -application org.adempiere.Client
+$JAVA -Xms32m -Xmx512m -Dosgi.compatibility.bootdelegation=true -DADEMPIERE_HOME=$ADEMPIERE_HOME $PROP $SECURE -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -install $ADEMPIERE_HOME/osgi -configuration $ADEMPIERE_HOME/osgi/client -application org.adempiere.Client
 
diff --git a/utils/RUN_Server2.sh b/utils/RUN_Server2.sh
index ef73150476..bad1771948 100644
--- a/utils/RUN_Server2.sh
+++ b/utils/RUN_Server2.sh
@@ -22,7 +22,7 @@ fi
 # SECURE=-DADEMPIERE_SECURE=org.compiere.util.Secure
 SECURE=
 
-VMARGS="-Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=$ADEMPIERE_HOME"
+VMARGS="-Dosgi.compatibility.bootdelegation=true -Djava.awt.headless=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DADEMPIERE_HOME=$ADEMPIERE_HOME"
 # headless option if you don't have X installed on the server
 $JAVA -server $VMARGS -jar $ADEMPIERE_HOME/osgi/org.eclipse.osgi_3.6.0.v20100517.jar -install $ADEMPIERE_HOME/osgi -configuration $ADEMPIERE_HOME/osgi/server -clean -console