Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -rdd32c9172c92f37d6f181fcacde81c90140d56b9 -r6554380a974d1d1ce19c561687068700b4eee434
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision dd32c9172c92f37d6f181fcacde81c90140d56b9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 6554380a974d1d1ce19c561687068700b4eee434)
@@ -479,5 +479,7 @@
 	public Organisation getRootOrganisation();
 	
 	public boolean isUserInRoleInOrganisation(String login, Integer roleId, Integer orgId);
+	
+	public void deleteOrganisationById(Integer orgId);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -rdd32c9172c92f37d6f181fcacde81c90140d56b9 -r6554380a974d1d1ce19c561687068700b4eee434
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision dd32c9172c92f37d6f181fcacde81c90140d56b9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 6554380a974d1d1ce19c561687068700b4eee434)
@@ -529,9 +529,13 @@
 		WorkspaceFolder workspaceFolder = createWorkspaceFolder(workspace,
 				userID, WorkspaceFolder.NORMAL);
 		workspace.setRootFolder(workspaceFolder);
-		workspaceDAO.update(workspace);
+		workspaceDAO.insertOrUpdate(workspace);
 		organisation.setWorkspace(workspace);
-		organisationDAO.insert(organisation);
+		if(organisation.getOrganisationId()==0){
+			organisationDAO.insert(organisation);
+		}else{
+			organisationDAO.update(organisation);
+		}
 		return organisation.getOrganisationId();
 	}
 
@@ -723,4 +727,8 @@
 		return userOrganisationRoleDAO.getUserOrganisationRole(userOrganisationDAO.getUserOrganisation(userDAO.getUserByLogin(login).getUserId(),orgId).getUserOrganisationId(),roleId)!=null;
 	}
 
+	public void deleteOrganisationById(Integer orgId) {
+		organisationDAO.deleteOrganisationById(orgId);
+	}
+
 }