Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r8e654e4c4051a09c1c19a069e258cb892a9030dc -r8c9d0522d72f7555032707bf54672e5330e5070c
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -re1ca1dd14914eaa08c50ba33698e4bdbd9738840 -r8c9d0522d72f7555032707bf54672e5330e5070c
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision e1ca1dd14914eaa08c50ba33698e4bdbd9738840)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 8c9d0522d72f7555032707bf54672e5330e5070c)
@@ -48,7 +48,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTOFactory;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.MessageService;
 
 /**
@@ -94,7 +93,6 @@
 		try{
 			if(object instanceof User){
 				User user = (User)object;
-				user.setPassword(HashUtil.sha1(user.getPassword()));
 				if(user.getUserId()==null){
 					baseDAO.insertOrUpdate(user);  // creating a workspace needs a userId
 					object = createWorkspaceForUser(user);
@@ -365,7 +363,7 @@
 	public void updatePassword(String login, String password) {
 		try{
 			User user = getUserByLogin(login);
-			user.setPassword(HashUtil.sha1(password));
+			//user.setPassword(HashUtil.sha1(password));
 			baseDAO.update(user);
 		}catch(Exception e){
 			log.debug(e);