Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r82a1759371ed35164db31ad274a85a6dd00de109
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 82a1759371ed35164db31ad274a85a6dd00de109)
@@ -265,10 +265,6 @@
         </meta>    
     </property>
     
-    <property name="userOrganisationID" type="java.lang.Integer" column="user_organisation_id" length="11" not-null="true">
-        <meta attribute="field-description">@hibernate.property column="user_organisation_id" length="11" </meta>    
-    </property>
-
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Workspace -->
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r82a1759371ed35164db31ad274a85a6dd00de109
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 82a1759371ed35164db31ad274a85a6dd00de109)
@@ -87,9 +87,6 @@
     /** persistent field */
     private Organisation baseOrganisation;
     
-    /** non-nullable persistent field */
-    private Integer userOrganisationID;
-
     /** persistent field */
     private Set learnerProgresses;
     
@@ -621,19 +618,6 @@
 							this.lastName,
 							this.login);
     }
-
-	/**
-	 * @return Returns the userOrganisationID.
-	 */
-	public Integer getUserOrganisationID() {
-		return userOrganisationID;
-	}
-	/**
-	 * @param userOrganisationID The userOrganisationID to set.
-	 */
-	public void setUserOrganisationID(Integer userOrganisationID) {
-		this.userOrganisationID = userOrganisationID;
-	}
 	
 	/**This method checks whether user is a member of the 
 	 * given organisation*/
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java
===================================================================
diff -u -r4a2deb79ebfd327cd6b7444f139de156eeb4434b -r82a1759371ed35164db31ad274a85a6dd00de109
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 4a2deb79ebfd327cd6b7444f139de156eeb4434b)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 82a1759371ed35164db31ad274a85a6dd00de109)
@@ -70,11 +70,9 @@
 		user.setDisabledFlag(new Boolean(false));
 		user.setCreateDate(new Date());
 		user.setAuthenticationMethod(authenticationMethodDAO.getAuthenticationMethodById(new Integer(2)));
-		user.setBaseOrganisation(organisationDAO.getOrganisationById(new Integer(1)));
-		user.setUserOrganisationID(new Integer(1));
-		userDAO.saveUser(user);		
-		user.setUserOrganisationID(createUserOrganisation(user));
-		userDAO.updateUser(user);		
+		user.setBaseOrganisation(organisationDAO.getOrganisationById(new Integer(1)));		
+		userDAO.saveUser(user);
+		createUserOrganisation(user);
 	}
 	private Integer createUserOrganisation(User user){
 		UserOrganisation userOrganisation = new UserOrganisation();