Index: lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rf86c30fda6211f683790ccb70376472f1698a622
--- lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision f86c30fda6211f683790ccb70376472f1698a622)
@@ -112,13 +112,13 @@
         name="userOrganisations"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all-delete-orphan"
 
            @hibernate.collection-key
             column="organisation_id"
Index: lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml
===================================================================
diff -u -r6068cdbbfae51dc5bf1a0283ed408d4cca31677c -rf86c30fda6211f683790ccb70376472f1698a622
--- lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 6068cdbbfae51dc5bf1a0283ed408d4cca31677c)
+++ lams_common/conf/hibernate/mappings/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision f86c30fda6211f683790ccb70376472f1698a622)
@@ -238,7 +238,7 @@
     </property>
     <property
         name="disabledFlag"
-        type="byte"
+        type="java.lang.Boolean"
         column="disabled_flag"
         not-null="true"
         length="1"
@@ -285,13 +285,13 @@
         name="userOrganisations"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all-delete-orphan"
 
            @hibernate.collection-key
             column="user_id"