diff --git a/base/src/org/compiere/model/MFormAccess.java b/base/src/org/compiere/model/MFormAccess.java
index 7bcefb5603..0e0686ae6e 100644
--- a/base/src/org/compiere/model/MFormAccess.java
+++ b/base/src/org/compiere/model/MFormAccess.java
@@ -71,7 +71,8 @@ public class MFormAccess extends X_AD_Form_Access
 	public MFormAccess (MForm parent, int AD_Role_ID)
 	{
 		super (parent.getCtx(), 0, parent.get_TrxName());
-		setClientOrg(parent);
+		MRole role = MRole.get(parent.getCtx(), AD_Role_ID);
+		setClientOrg(role);
 		setAD_Form_ID(parent.getAD_Form_ID());
 		setAD_Role_ID (AD_Role_ID);
 	}	//	MFormAccess
diff --git a/base/src/org/compiere/model/MProcessAccess.java b/base/src/org/compiere/model/MProcessAccess.java
index 3a58485fe8..7e192c7016 100644
--- a/base/src/org/compiere/model/MProcessAccess.java
+++ b/base/src/org/compiere/model/MProcessAccess.java
@@ -74,7 +74,8 @@ public class MProcessAccess extends X_AD_Process_Access
 	public MProcessAccess (MProcess parent, int AD_Role_ID)
 	{
 		super (parent.getCtx(), 0, parent.get_TrxName());
-		setClientOrg(parent);
+		MRole role = MRole.get(parent.getCtx(), AD_Role_ID);
+		setClientOrg(role);
 		setAD_Process_ID (parent.getAD_Process_ID());
 		setAD_Role_ID (AD_Role_ID);
 	}	//	MProcessAccess
diff --git a/base/src/org/compiere/model/MWindowAccess.java b/base/src/org/compiere/model/MWindowAccess.java
index 036b6a33af..f77a3694e9 100644
--- a/base/src/org/compiere/model/MWindowAccess.java
+++ b/base/src/org/compiere/model/MWindowAccess.java
@@ -72,7 +72,8 @@ public class MWindowAccess extends X_AD_Window_Access
 	public MWindowAccess (MWindow parent, int AD_Role_ID)
 	{
 		super (parent.getCtx(), 0, parent.get_TrxName());
-		setClientOrg(parent);
+		MRole role = MRole.get(parent.getCtx(), AD_Role_ID);
+		setClientOrg(role);
 		setAD_Window_ID(parent.getAD_Window_ID());
 		setAD_Role_ID (AD_Role_ID);
 	}	//	MWindowAccess
diff --git a/base/src/org/compiere/wf/MWorkflowAccess.java b/base/src/org/compiere/wf/MWorkflowAccess.java
index 9422fe7aa8..b5d5ad697c 100644
--- a/base/src/org/compiere/wf/MWorkflowAccess.java
+++ b/base/src/org/compiere/wf/MWorkflowAccess.java
@@ -19,6 +19,7 @@ package org.compiere.wf;
 import java.sql.ResultSet;
 import java.util.Properties;
 
+import org.compiere.model.MRole;
 import org.compiere.model.X_AD_Workflow_Access;
 
 
@@ -74,7 +75,8 @@ public class MWorkflowAccess extends X_AD_Workflow_Access
 	public MWorkflowAccess (MWorkflow parent, int AD_Role_ID)
 	{
 		super (parent.getCtx(), 0, parent.get_TrxName());
-		setClientOrg(parent);
+		MRole role = MRole.get(parent.getCtx(), AD_Role_ID);
+		setClientOrg(role);
 		setAD_Workflow_ID(parent.getAD_Workflow_ID());
 		setAD_Role_ID (AD_Role_ID);
 	}	//	MWorkflowAccess