Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.19 -r1.20
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	7 Jun 2006 02:49:15 -0000	1.19
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	8 Jun 2006 07:05:20 -0000	1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	7 Jun 2006 02:49:15 -0000	1.24
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	8 Jun 2006 07:05:20 -0000	1.25
@@ -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);
+	}
+
 }