Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r081bc3d93d1a579339c13bebc7f708a9a69f3424
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 081bc3d93d1a579339c13bebc7f708a9a69f3424)
@@ -408,6 +408,7 @@
 		return user;
 	}
 
+	@SuppressWarnings("unchecked")
 	public Workspace createWorkspaceForOrganisation(String workspaceName, Integer userID, Date createDateTime ) {
 		
 		// this method is public so it can be accessed from the junit test
@@ -424,7 +425,10 @@
 		WorkspaceFolder workspaceFolder2 = new WorkspaceFolder(description,userID, createDateTime, createDateTime, WorkspaceFolder.RUN_SEQUENCES);
 		workspaceFolder2.setParentWorkspaceFolder(workspaceFolder);
 		save(workspaceFolder2);
-
+		
+		workspaceFolder.addChild(workspaceFolder2);
+		save(workspaceFolder);
+		
 		Workspace workspace =  new Workspace(workspaceName);
 		workspace.setDefaultFolder(workspaceFolder);
 		workspace.setDefaultRunSequencesFolder(workspaceFolder2);