diff --git a/client/src/org/compiere/grid/ed/VBPartner.java b/client/src/org/compiere/grid/ed/VBPartner.java
index f8c8554220..3c41826dbe 100644
--- a/client/src/org/compiere/grid/ed/VBPartner.java
+++ b/client/src/org/compiere/grid/ed/VBPartner.java
@@ -398,6 +398,7 @@ public final class VBPartner extends CDialog implements ActionListener
 		{
 			int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
 			m_partner = MBPartner.getTemplate(Env.getCtx(), AD_Client_ID);
+			m_partner.setAD_Org_ID(Env.getAD_Org_ID(Env.getCtx())); // Elaine 2009/07/03
 			boolean isSOTrx = !"N".equals(Env.getContext(Env.getCtx(), m_WindowNo, "IsSOTrx"));
 			m_partner.setIsCustomer (isSOTrx);
 			m_partner.setIsVendor (!isSOTrx);
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java b/zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
index 54c3e7c127..58beda32d9 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
@@ -397,6 +397,7 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
 		{
 			int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
 			m_partner = MBPartner.getTemplate(Env.getCtx(), AD_Client_ID);
+			m_partner.setAD_Org_ID(Env.getAD_Org_ID(Env.getCtx())); // Elaine 2009/07/03
 			boolean isSOTrx = !"N".equals(Env.getContext(Env.getCtx(), m_WindowNo, "IsSOTrx"));
 			m_partner.setIsCustomer (isSOTrx);
 			m_partner.setIsVendor (!isSOTrx);