Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r6554380a974d1d1ce19c561687068700b4eee434 -ra217ec496faa38cd996876c85fefcf1d74089a86
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 6554380a974d1d1ce19c561687068700b4eee434)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision a217ec496faa38cd996876c85fefcf1d74089a86)
@@ -531,11 +531,7 @@
 		workspace.setRootFolder(workspaceFolder);
 		workspaceDAO.insertOrUpdate(workspace);
 		organisation.setWorkspace(workspace);
-		if(organisation.getOrganisationId()==0){
-			organisationDAO.insert(organisation);
-		}else{
-			organisationDAO.update(organisation);
-		}
+		organisationDAO.insertOrUpdate(organisation);
 		return organisation.getOrganisationId();
 	}