diff --git a/org.adempiere.base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java
index 6e1da3ac82..7d6a1aa504 100644
--- a/org.adempiere.base/src/org/compiere/model/MUser.java
+++ b/org.adempiere.base/src/org/compiere/model/MUser.java
@@ -763,7 +763,7 @@ public class MUser extends X_AD_User
 			+ "WHERE r.IsActive='Y'" 
 			+ " AND EXISTS (SELECT * FROM AD_User_Roles ur" 
 			+ " WHERE r.AD_Role_ID=ur.AD_Role_ID AND ur.IsActive='Y' AND ur.AD_User_ID=?) "
-			+ " AND ("
+			+ " AND ( ( r.isaccessallorgs = 'Y' ) OR "
 			+ " ("
 			+ " r.IsUseUserOrgAccess <> 'Y'"
 			+ " AND EXISTS (SELECT * FROM AD_Role_OrgAccess ro"