diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
index 5c9c826375..28100cc277 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
@@ -71,9 +71,11 @@ import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.WebDoc;
+import org.jfree.util.Log;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.HtmlBasedComponent;
+import org.zkoss.zk.ui.Session;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -237,7 +239,25 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
      */
 	public boolean initPanel(int adWindowId, MQuery query)
     {
-        // Set AutoCommit for this Window
+		// This temporary validation code is added to check the reported bug
+		// [ adempiere-ZK Web Client-2832968 ] User context lost?
+		// https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2832968&group_id=176962
+		// it's harmless, if there is no bug then this must never fail
+		Session currSess = Executions.getCurrent().getDesktop().getSession();
+		int checkad_user_id=(Integer)currSess.getAttribute("Check_AD_User_ID");
+		if (checkad_user_id!=Env.getAD_User_ID(ctx))  
+		{
+			String msg = "Bug 2832968 SessionUser="
+					+ checkad_user_id
+					+ ", ContextUser="
+					+ Env.getAD_User_ID(ctx)
+					+ ".  Please report conditions to your system administrator or in sf tracker 2832968";
+			logger.warning(msg);
+			throw new ApplicationException(msg); 
+		}
+		// End of temporary code for [ adempiere-ZK Web Client-2832968 ] User context lost?
+		
+		// Set AutoCommit for this Window
 		if (embeddedTabindex < 0)
 		{
 			Env.setAutoCommit(ctx, curWindowNo, Env.isAutoCommit(ctx));
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
index 474040fc02..10622429d3 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
@@ -52,6 +52,8 @@ import org.zkoss.zk.au.out.AuFocus;
 import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.fn.ZkFns;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.Session;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -323,5 +325,13 @@ public class LoginPanel extends Window implements EventListener
 
             Clients.response("zkLocaleJavaScript", new AuScript(null, ZkFns.outLocaleJavaScript()));
         }
+
+		// This temporary validation code is added to check the reported bug
+		// [ adempiere-ZK Web Client-2832968 ] User context lost?
+		// https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2832968&group_id=176962
+		// it's harmless, if there is no bug then this must never fail
+        Session currSess = Executions.getCurrent().getDesktop().getSession();
+        currSess.setAttribute("Check_AD_User_ID", Env.getAD_User_ID(ctx));
+		// End of temporary code for [ adempiere-ZK Web Client-2832968 ] User context lost?
     }
 }