diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
index a63241cb0f..b98d98e6cd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
@@ -206,6 +206,8 @@ public final class AMenu extends CFrame
                 treePanel.expandTree(true);
         // Auto Expand Tree - nmicoud IDEMPIERE 195
 
+        Env.setContext(Env.getCtx(), "#UIClient", "swing");
+        
 		//
 		Env.addEventListener(this);
 		//
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 7b102c6fc5..cd32dde461 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -353,6 +353,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 			BrowserToken.remove();
 		}
 		
+		Env.setContext(ctx, "#UIClient", "zk");
+		
 		Clients.response(new AuScript("zAu.cmd0.clearBusy()"));
     }