Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r48eb3881563dc0f2576c2df926f47a75424e1e84 -rbff15f091cbdc9635aec6f2a28c9c25e8a117eaf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 48eb3881563dc0f2576c2df926f47a75424e1e84)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision bff15f091cbdc9635aec6f2a28c9c25e8a117eaf)
@@ -107,11 +107,11 @@
 <sql-query name="userOrganisationsNotById">
 	<return alias="userOrganisation" class="org.lamsfoundation.lams.usermanagement.UserOrganisation" />
 	SELECT {userOrganisation.*}
-	  FROM lams_user_organisation {userOrganisation}, lams_organisation o
-	  WHERE {userOrganisation}.user_id = :userId
-	    AND {userOrganisation}.organisation_id != :orgId 
-	    AND o.organisation_id = {userOrganisation}.organisation_id 
-	    AND o.parent_organisation_id != :orgId
+	  FROM lams_user_organisation AS {userOrganisation}
+	  JOIN lams_organisation AS o ON {userOrganisation}.user_id = :userId
+	  	AND {userOrganisation}.organisation_id != :orgId
+	  	AND o.parent_organisation_id != :orgId
+	  	AND o.organisation_id = {userOrganisation}.organisation_id
 </sql-query>
 
 </hibernate-mapping>