diff --git a/org.adempiere.base/src/org/compiere/util/WebEnv.java b/org.adempiere.base/src/org/compiere/util/WebEnv.java
index 5e87abaf51..a4e10302f7 100644
--- a/org.adempiere.base/src/org/compiere/util/WebEnv.java
+++ b/org.adempiere.base/src/org/compiere/util/WebEnv.java
@@ -47,6 +47,7 @@ import org.apache.ecs.xhtml.tr;
 import org.compiere.Adempiere;
 import org.compiere.model.MClient;
 import org.compiere.model.MSystem;
+import org.compiere.model.SystemIDs;
 
 /**
  *  Web Environment and debugging
@@ -150,7 +151,7 @@ public class WebEnv
 
 		Properties ctx = new Properties();
 		Env.setContext(ctx, Env.AD_CLIENT_ID, 0);
-		Env.setContext(ctx, Env.AD_USER_ID, 0);
+		Env.setContext(ctx, Env.AD_USER_ID, SystemIDs.USER_SYSTEM);
 		ServerContext.setCurrentInstance(ctx);
 		
 		//  Load Environment Variables (serverApps/src/web/WEB-INF/web.xml)
diff --git a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
index dfd16b1f0f..5b436d5467 100644
--- a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
+++ b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
@@ -74,6 +74,7 @@ import org.compiere.model.MSession;
 import org.compiere.model.MSysConfig;
 import org.compiere.model.MSystem;
 import org.compiere.model.Query;
+import org.compiere.model.SystemIDs;
 import org.compiere.server.AdempiereServerGroup;
 import org.compiere.server.AdempiereServerMgr;
 import org.compiere.server.IServerManager;
@@ -1344,7 +1345,7 @@ public class AdempiereMonitor extends HttpServlet
 			try {
 				Properties ctx = new Properties();
 				Env.setContext(ctx, Env.AD_CLIENT_ID, 0);
-				Env.setContext(ctx, Env.AD_USER_ID, 0);
+				Env.setContext(ctx, Env.AD_USER_ID, SystemIDs.USER_SYSTEM);
 				ServerContext.setCurrentInstance(ctx);
 				
 				int maxSecondsToWait = MSysConfig.getIntValue(MSysConfig.MONITOR_MAX_WAIT_FOR_CLUSTER_IN_SECONDS, 180);