Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8789b9d507a7c0867ad6c0c5ef1ff2c9d65e1f8a -rdcdfda709789f888e53f264b20762f3b76dbdae3
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8789b9d507a7c0867ad6c0c5ef1ff2c9d65e1f8a)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision dcdfda709789f888e53f264b20762f3b76dbdae3)
@@ -94,6 +94,7 @@
 admin.user.assign.roles  =Assign roles
 admin.user.find  =Find users
 admin.user.edit  =Edit user details
+admin.user.changePassword  =Change Password
 admin.user.disable  =Disable user
 admin.user.actions  =Actions
 admin.user.import  =Import users
@@ -537,6 +538,7 @@
 label.password.restrictions  =Password must follow the restrictions shown above
 label.password.must.contain  =Password must contain
 label.password.must.ucase  =at least 1 upper case letter
+label.password.must.lcase  =at least 1 lower case letter
 label.password.must.number  =at least 1 number
 label.password.must.symbol  =at least 1 symbol
 sysadmin.batch.preview.lesson.delete  =Delete old preview lessons
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r380ede712d98f28edcaea21f3525f12cc52b3237 -rdcdfda709789f888e53f264b20762f3b76dbdae3
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 380ede712d98f28edcaea21f3525f12cc52b3237)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision dcdfda709789f888e53f264b20762f3b76dbdae3)
@@ -67,7 +67,6 @@
 	<form-property name="password" type="java.lang.String" />
 	<form-property name="password2" type="java.lang.String" />
 	<form-property name="changePassword" type="java.lang.String" />
-	<form-property name="salt" type="java.lang.String" />
 	<form-property name="authenticationMethodId" type="java.lang.Integer" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="firstName" type="java.lang.String" />
@@ -319,6 +318,7 @@
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
+      parameter="method"
       scope="request"
       input=".user"
       unknown="false"
@@ -329,6 +329,11 @@
         path="/user.do?method=edit"
         redirect="false"
       />
+       <forward
+        name="userChangePass"
+         path="/user.do?method=edit"
+        redirect="false"
+      />
       <forward
         name="userlist"
         path="/usermanage.do"
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r2808afde61e72ed316431219a592f53ec2ba05f6 -rdcdfda709789f888e53f264b20762f3b76dbdae3
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 2808afde61e72ed316431219a592f53ec2ba05f6)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision dcdfda709789f888e53f264b20762f3b76dbdae3)
@@ -12,23 +12,25 @@
 
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
 <link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
 
 <script type="text/javascript">
-	$.validator.addMethod("pwcheck", function(value) {
-		return /[a-z]/.test(value) // has a lowercase letter
-		<c:if test="${mustHaveUppercase}"> && /[A-Z]/.test(value) // has uppercase letters 
-		</c:if>
-		<c:if test="${mustHaveNumerics}"> && /\d/.test(value) // has a digit
-		</c:if>
-		<c:if test="${mustHaveSymbols}">
-				&& /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value) //has symbols
-		</c:if>
-	});
+var mustHaveUppercase = ${mustHaveUppercase},
+mustHaveNumerics  = ${mustHaveNumerics},
+mustHaveLowercase  = ${mustHaveLowercase},
+mustHaveSymbols   = ${mustHaveSymbols};
 
+$.validator.addMethod("pwcheck", function(value) {
+ return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters 
+(!mustHaveNumerics || /\d/.test(value)) && // has a digit
+(!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case
+(!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols
+});
+
 	$.validator.addMethod("charactersAllowed", function(value) {
 		return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/
 				.test(value)
@@ -102,7 +104,7 @@
 	});
 </script>
 
-<html-el:form styleId="UserForm" action="/usersave.do" method="post">
+<html-el:form styleId="UserForm" action="usersave.do?method=saveUserDetails" method="post">
 	<html-el:hidden property="userId" />
 	<html-el:hidden property="orgId" />
 
@@ -145,7 +147,7 @@
 		</div>
 
 		<div class="panel-body">
-			 
+			<logic:empty name="UserForm" property="userId">
 			<lams:Alert type="info" id="passwordConditions" close="false">
 			<fmt:message key='label.password.must.contain' />:
 				<ul class="list-unstyled" style="line-height: 1.2">
@@ -158,6 +160,10 @@
 						<li><span class="fa fa-check"></span> <fmt:message
 								key='label.password.must.ucase' /></li>
 					</c:if>
+					<c:if test="${mustHaveLowercase}">
+								<li><span class="fa fa-check"></span> <fmt:message
+										key='label.password.must.lcase' /></li>
+							</c:if>
 
 					<c:if test="${mustHaveNumerics}">
 						<li><span class="fa fa-check"></span> <fmt:message
@@ -171,6 +177,7 @@
 					</c:if>
 				</ul>
 			</lams:Alert>
+		</logic:empty>
 
 			<table class="table table-condensed table-no-border">
 				<tr>
@@ -179,6 +186,7 @@
 					<td><html-el:text styleId="login" property="login"  maxlength="50"
 							styleClass="form-control" /></td>
 				</tr>
+				<logic:empty name="UserForm" property="userId">
 				<tr>
 					<td class="align-right"><fmt:message key="admin.user.password" />
 						*:</td>
@@ -191,6 +199,7 @@
 					<td><html-el:password property="password2" 
 							maxlength="25" styleId="password2" styleClass="form-control" /></td>
 				</tr>
+				</logic:empty>
 				<tr>
 					<td class="align-right"><fmt:message
 							key="admin.user.authentication.method" />:</td>
@@ -369,7 +378,11 @@
 				</c:if>
 				
 			</table>
-
+			<logic:notEmpty name="UserForm" property="userId">
+			<div class="pull-left">
+			<a href="userChangePass.jsp?userId=<bean:write name='UserForm' property='userId' />&login=<bean:write name='UserForm' property='login' />" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
+			</div>
+			</logic:notEmpty>
 			<div class="pull-right">
 				<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="<fmt:message key="admin.cancel" />" 
 						formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-default"/>
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u
--- lams_admin/web/userChangePass.jsp	(revision 0)
+++ lams_admin/web/userChangePass.jsp	(revision dcdfda709789f888e53f264b20762f3b76dbdae3)
@@ -0,0 +1,165 @@
+<%@ include file="/taglibs.jsp"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%-- javascript --%>
+<script type="text/javascript"
+	src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript"
+	src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript"
+	src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript"
+	src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+<link href="/lams/css/defaultHTML_learner.css" rel="stylesheet"
+	type="text/css">
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+<%@ page import="org.apache.struts.action.ActionMessages"%>
+
+
+<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+
+<script type="text/javascript">
+     var mustHaveUppercase = ${mustHaveUppercase},
+     mustHaveNumerics  = ${mustHaveNumerics},
+     mustHaveLowercase  = ${mustHaveLowercase},
+     mustHaveSymbols   = ${mustHaveSymbols};
+
+     $.validator.addMethod("pwcheck", function(value) {
+      return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters 
+    (!mustHaveNumerics || /\d/.test(value)) && // has a digit
+    (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case
+    (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols
+     });
+	$.validator.addMethod("charactersAllowed", function(value) {
+		return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/
+				.test(value)
+	});
+
+	$(function() {
+		// Setup form validation 
+		$("#UserChangePassForm").validate({
+							debug : true,
+							errorClass : 'help-block',
+							//  validation rules
+							rules : {
+								login : {
+									required: true,
+									maxlength : 50
+								},
+								password : {
+									required: true,
+									minlength : <c:out value="${minNumChars}"/>,
+									maxlength : 25,
+									charactersAllowed : true,
+									pwcheck : true
+									 
+								},
+								password2 : {
+									equalTo : "#password"
+								}
+								
+							},
+
+							// Specify the validation error messages
+							messages : {
+								login : {
+									required: "<fmt:message key='error.login.required'/>"
+								},
+								password : {
+									required : "<fmt:message key='error.password.empty'/>",
+									minlength : "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+									maxlength : "<fmt:message key='label.password.max.length'/>",
+									charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+									pwcheck : "<fmt:message key='label.password.restrictions'/>"
+								},
+								password2: {
+									equalTo : "<fmt:message key='error.password.mismatch'/>"
+								}
+								
+							},
+
+							submitHandler : function(form) {
+								form.submit();
+							}
+		});
+
+	});
+</script>
+<body class="stripes">
+	<form id="UserChangePassForm" action="usersave.do?method=changePass"
+		method="post">
+		<input type='hidden' value="${param.userId}" name="userId" />
+		<div class="panel panel-default">
+			<div
+				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
+				<div class="panel voffset20">
+					<div class="panel panel-default">
+						<div class="panel-heading">
+							<div class="panel-title">
+								<fmt:message key="admin.user.edit" />
+							</div>
+						</div>
+					</div>
+					<div class="panel-body">
+
+						<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.min.length'>
+										<fmt:param value='${minNumChars}' />
+									</fmt:message></li>
+
+								<c:if test="${mustHaveUppercase}">
+									<li><span class="fa fa-check"></span> <fmt:message
+											key='label.password.must.ucase' /></li>
+								</c:if>
+								<c:if test="${mustHaveLowercase}">
+									<li><span class="fa fa-check"></span> <fmt:message
+											key='label.password.must.lcase' /></li>
+								</c:if>
+
+								<c:if test="${mustHaveNumerics}">
+									<li><span class="fa fa-check"></span> <fmt:message
+											key='label.password.must.number' /></li>
+								</c:if>
+
+
+								<c:if test="${mustHaveSymbols}">
+									<li><span class="fa fa-check"></span> <fmt:message
+											key='label.password.must.symbol' /></li>
+								</c:if>
+							</ul>
+						</lams:Alert>
+						<div>
+							<label for="login"><fmt:message key="admin.user.login" />:</label>
+							<span>${param.login}</span>
+						</div>
+						<div class="form-group">
+							<label for="password"><fmt:message
+									key="admin.user.password" />:</label> <input type="password"
+								name="password" maxlength="25" id="password"
+								class="form-control" />
+						</div>
+						<div class="form-group">
+							<label for="password2"><fmt:message
+									key="admin.user.password.confirm" />:</label> <input type="password"
+								name="password2" maxlength="25" id="password2"
+								class="form-control" />
+						</div>
+						<div class="pull-right">
+							<a href="javascript:history.back();" class="btn btn-default">
+								<fmt:message key="admin.cancel" />
+							</a> <input type="submit" id="saveButton" class="btn btn-primary"
+								value="<fmt:message key="admin.save" />" />
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
\ No newline at end of file