Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -r8a4d69bf6159f6bcd910eb930d77016e255619e9 -rc9b6b8fde3052b687a18f442b509d5664cd9d5a0
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision c9b6b8fde3052b687a18f442b509d5664cd9d5a0)
@@ -263,13 +263,4 @@
 	 */
 	public UserOrganisation getUserOrganisation(Integer userId, Integer orgId);
 	
-	/** 
-	 * Save an organisation. If it is a new course organisation then it will create a workspace and 
-	 * its workspace folders.
-	 * 
-	 * @param organisation
-	 * @param userID
-	 * @return
-	 */
-	public Organisation saveOrganisation( Organisation organisation, Integer userID ); 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r8a4d69bf6159f6bcd910eb930d77016e255619e9 -rc9b6b8fde3052b687a18f442b509d5664cd9d5a0
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision c9b6b8fde3052b687a18f442b509d5664cd9d5a0)
@@ -34,13 +34,9 @@
 import java.util.Map;
 import java.util.Vector;
 
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -53,8 +49,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * <p>
@@ -96,10 +90,18 @@
 	}
 	
 	public void save(Object object) {
-		if(object instanceof User){
-			object = createWorkspaceForUser((User)object);
+		try{
+			if(object instanceof User){
+				User user = (User)object;
+				object = createWorkspaceForUser(user);
+				if(user.getUserId()==null){
+					user.setPassword(HashUtil.sha1(user.getPassword()));
+				}
+			}
+			baseDAO.insertOrUpdate(object);
+		}catch(Exception e){
+			log.debug(e);
 		}
-		baseDAO.insertOrUpdate(object);
 	}
 
 	public void saveAll(Collection objects) {
@@ -387,23 +389,6 @@
 		return user;
 	}
 
-	public Organisation saveOrganisation( Organisation organisation, Integer userID ) 
-	{
-
-		if ( organisation.getOrganisationId() == null ) {
-			Date createDateTime = new Date();
-			organisation.setCreateDate(createDateTime);
-
-			if(organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.COURSE_TYPE)){
-				Workspace workspace = createWorkspaceForOrganisation(organisation.getName(), userID, createDateTime);
-				organisation.setWorkspace(workspace);
-			}
-		}
-		
-		save(organisation);
-		return organisation;
-	}
-
 	public Workspace createWorkspaceForOrganisation(String workspaceName, Integer userID, Date createDateTime ) {
 		
 		// this method is public so it can be accessed from the junit test