Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
===================================================================
diff -u -r26a83b93c1ce8fa610895f50b57d44d6b7cc11db -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision 26a83b93c1ce8fa610895f50b57d44d6b7cc11db)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -281,14 +281,14 @@
 		}
 	    }
 
+	    userManagementService.updatePassword(user, password);
 	    // change password
 	    if (force) {
 		user.setChangePassword(true);
+		userManagementService.save(user);
 	    }
-	    userManagementService.updatePassword(user, password);
 
 	    log.info("Changed password for user ID " + user.getUserId());
-	    userManagementService.logPasswordChanged(user, currentUser);
 	    changedUserIDs.add(user.getUserId());
 	}
 	return changedUserIDs;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -r26a83b93c1ce8fa610895f50b57d44d6b7cc11db -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 26a83b93c1ce8fa610895f50b57d44d6b7cc11db)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -295,8 +295,6 @@
 	    return null;
 	}
 
-	User sysadmin = (User) userManagementService.findById(User.class, loggeduserId);
-
 	String password = WebUtil.readStrParam(request, "password");
 	String password2 = WebUtil.readStrParam(request, "password2");
 
@@ -318,7 +316,6 @@
 	if (errorMap.isEmpty()) {
 
 	    userManagementService.updatePassword(user, password);
-	    userManagementService.logPasswordChanged(user, sysadmin);
 	    return "forward:/user/edit.do";
 	}
 	request.setAttribute("errorMap", errorMap);
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u -re88830091139dd447cdd6a7f30c129c777104dac -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision e88830091139dd447cdd6a7f30c129c777104dac)
+++ lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -104,9 +104,6 @@
 						<lams:Alert type="info" id="passwordConditions" close="false">
 							<fmt:message key='label.password.must.contain' />:
 				<ul class="list-unstyled" style="line-height: 1.2">
-								<li><span class="fa fa-check"></span>
-									<fmt:message key='label.password.user.details' />
-								</li>
 								<li><span class="fa fa-check"></span> <fmt:message
 										key='label.password.min.length'>
 										<fmt:param value='${minNumChars}' />
Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -r4c272c96c3885f945357ffff697c662ff04d2e75 -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision 4c272c96c3885f945357ffff697c662ff04d2e75)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -245,7 +245,7 @@
 	    if (now < cutoffTime) {
 		User user = (User) userManagementService.findById(User.class, fp.getUserId());
 		userManagementService.updatePassword(user, newPassword);
-		userManagementService.logPasswordChanged(user, user);
+
 		languageKey = ForgotPasswordServlet.SUCCESS_CHANGE_PASS;
 
 	    } else {
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
===================================================================
diff -u -r8ebe651ed3972b4e53c75dd45e9f0ba1f9b63b3d -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 8ebe651ed3972b4e53c75dd45e9f0ba1f9b63b3d)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(.../IndexController.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -98,10 +98,7 @@
 	    userDTO.setFirstLogin(false);
 	}
 
-	if (user.getPasswordChangeDate() == null) {
-	    user.setPasswordChangeDate(LocalDateTime.now());
-	    userManagementService.save(user);
-	} else {
+	if (user.getPasswordChangeDate() != null) {
 	    int expirationPeriod = Configuration.getAsInt(ConfigurationKeys.PASSWORD_EXPIRATION_MONTHS);
 	    if (expirationPeriod > 0) {
 		LocalDateTime expirationDate = user.getPasswordChangeDate().plusMonths(expirationPeriod);
Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
===================================================================
diff -u -r26a83b93c1ce8fa610895f50b57d44d6b7cc11db -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 26a83b93c1ce8fa610895f50b57d44d6b7cc11db)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -39,10 +39,9 @@
 	user.setAuthenticationMethod(getAuthenticationMethod(AuthenticationMethod.DB));
 	user.setLocale(getDefaultLocale());
 	user.setCreateDate(new Date());
-	userManagementService.saveUser(user);
-
+	
 	userManagementService.updatePassword(user, password);
-
+	
 	// add to org
 	SignupOrganisation signup = signupDAO.getSignupOrganisation(context);
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r5fbc1fd3387324f865a35da5c068029b39ed9221 -r65ed3834599c7868a2f7948a02500b28b071b579
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 5fbc1fd3387324f865a35da5c068029b39ed9221)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 65ed3834599c7868a2f7948a02500b28b071b579)
@@ -433,6 +433,8 @@
 	user.setChangePassword(false);
 
 	baseDAO.update(user);
+
+	logPasswordChanged(user, user);
     }
 
     @Override