diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index 3df4e16c3c..c0be165330 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -390,6 +390,15 @@ public final class Env
 		ctx.setProperty(WindowNo+"|"+context, String.valueOf(value));
 	}	//	setContext
 
+	public static void setContext (Properties ctx, int WindowNo, int TabNo, String context, int value)
+	{
+		if (ctx == null || context == null)
+			return;
+		if (log.isLoggable(Level.FINER)) log.finer("Context("+WindowNo+") " + context + "==" + value);
+		//
+		ctx.setProperty(WindowNo+"|"+TabNo+"|"+context, String.valueOf(value));
+	}	//	setContext
+
 	/**
 	 *	Set Context for Window to Y/N Value
 	 *  @param ctx context
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
index 4ead03f260..de5bf7d759 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
@@ -1212,7 +1212,9 @@ public final class WAccountDialog extends Window
 		Object newValue = evt.getNewValue();
 		if (newValue instanceof Integer) {
 			Env.setContext(Env.getCtx(), m_WindowNo, "Account_ID", ((Integer)newValue).intValue());
+			Env.setContext(Env.getCtx(), m_WindowNo, 0, "Account_ID", ((Integer)newValue).intValue());
 			if (f_SubAcct_ID != null) {
+				f_SubAcct_ID.setValue(null);
 				f_SubAcct_ID.dynamicDisplay();
 			}
 		}