Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -rf01c1b7b44db4f0994cb22ec8d7c9c2418f8679c
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision f01c1b7b44db4f0994cb22ec8d7c9c2418f8679c)
@@ -323,7 +323,7 @@
     </many-to-one>
     <!-- bi-directional many-to-one association to Organisation -->
     <many-to-one
-        name="lamsOrganisation"
+        name="baseOrganisation"
         class="com.lamsinternational.lams.usermanagement.Organisation"
         not-null="true"
     >