diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
index e6d4ae084a..2065ae7f6e 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
@@ -227,6 +227,7 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
 					continue;
 				//	Do start
 				//	replace
+				Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID());
 				server.getServer().recalculateSleepMS();
 				server.start();
 			}
@@ -235,6 +236,7 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
 				log.log(Level.SEVERE, "Server: " + server, e);
 			}
 		}	//	for all servers
+		Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, 0);
 		
 		//	Final Check
 		int noRunning = 0;
@@ -281,6 +283,7 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
 		try
 		{
 			//	replace
+			Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID());
 			server.getServer().recalculateSleepMS();
 			server.start();
 		}
@@ -289,6 +292,10 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
 			log.log(Level.SEVERE, "Server=" + serverID, e);
 			return false;
 		}
+		finally
+		{
+			Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, 0);
+		}
 		if (log.isLoggable(Level.INFO)) log.info(server.toString());
 		return (server.scheduleFuture != null && !server.scheduleFuture.isDone());
 	}	//	startIt