diff --git a/org.adempiere.base/src/org/compiere/dbPort/Convert.java b/org.adempiere.base/src/org/compiere/dbPort/Convert.java
index 66c002bfce..de45eb29b6 100644
--- a/org.adempiere.base/src/org/compiere/dbPort/Convert.java
+++ b/org.adempiere.base/src/org/compiere/dbPort/Convert.java
@@ -435,7 +435,13 @@ public abstract class Convert
 	public static void logMigrationScript(String oraStatement, String pgStatement) {
 		// Check AdempiereSys
 		// check property Log migration script
-		boolean logMigrationScript = Ini.isPropertyBool(Ini.P_LOGMIGRATIONSCRIPT);
+		boolean logMigrationScript = false;
+		if (Ini.isClient()) {
+			logMigrationScript = Ini.isPropertyBool(Ini.P_LOGMIGRATIONSCRIPT);
+		} else {
+			String sysProperty = System.getProperty(Ini.P_LOGMIGRATIONSCRIPT);
+			logMigrationScript = "y".equalsIgnoreCase(sysProperty) || "true".equalsIgnoreCase(sysProperty);
+		}
 		if (logMigrationScript) {
 			if (dontLog(oraStatement))
 				return;
diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java
index 5f4b2bb1ea..569642a9af 100644
--- a/org.adempiere.base/src/org/compiere/model/MSequence.java
+++ b/org.adempiere.base/src/org/compiere/model/MSequence.java
@@ -88,7 +88,16 @@ public class MSequence extends X_AD_Sequence
 		int retValue = -1;
 
 		//	Check AdempiereSys
-		boolean adempiereSys = Ini.isPropertyBool(Ini.P_ADEMPIERESYS);
+		boolean adempiereSys = false;
+		if (Ini.isClient()) 
+		{
+			adempiereSys = Ini.isPropertyBool(Ini.P_ADEMPIERESYS);
+		} 
+		else
+		{
+			String sysProperty = System.getProperty(Ini.P_ADEMPIERESYS);
+			adempiereSys = "y".equalsIgnoreCase(sysProperty) || "true".equalsIgnoreCase(sysProperty);
+		}
 		if (adempiereSys && AD_Client_ID > 11)
 			adempiereSys = false;
 		//
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
index 87b49cf91a..21893172d9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
@@ -89,8 +89,6 @@ public class WebUIServlet extends DHtmlLayoutServlet
 
         logger = CLogger.getCLogger(WebUIServlet.class);
 
-        // hengsin: temporary solution for problem with zk client
-        Ini.setProperty(Ini.P_ADEMPIERESYS, false);
         logger.log(Level.OFF, "ADempiere web ui service started successfully");
         /**
          * End ADempiere Start