Index: lams_admin/web/user.jsp
===================================================================
diff -u -r399fafea8d30e59f81414f332a7e8a5ed527aee4 -r3f3f34c22194aeaf302e1fd332925dffd35019aa
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 399fafea8d30e59f81414f332a7e8a5ed527aee4)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
@@ -58,7 +58,7 @@
 									password : {
 										required: true,
 										minlength : <c:out value="${minNumChars}"/>,
-										maxlength : 25,
+										maxlength : 50,
 										charactersAllowed : true,
 										pwcheck : true
 									},
@@ -283,13 +283,13 @@
 									*:</td>
 								<td><lams:errors path="password"/>
 									<form:input type="password" path="password" 
-										maxlength="25" id="password" cssClass="form-control" /></td>
+										maxlength="50" id="password" cssClass="form-control" /></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.password.confirm" /> *:</td>
 								<td><form:input type="password" path="password2" 
-										maxlength="25" id="password2" cssClass="form-control" /></td>
+										maxlength="50" id="password2" cssClass="form-control" /></td>
 							</tr>
 							</c:if>
 							<tr>
@@ -495,16 +495,15 @@
 						</table>
 					</div>
 					</div>
-					
 					<c:if test="${isAppadmin}">
 						<div class="row">
 						<div class="col-md-12">
-							<c:if test="${not empty userForm.userId}">
+							<c:if test="${isSysadmin and not empty userForm.userId}">
 								<div class="pull-left">
 								<a href="<lams:LAMSURL/>admin/userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
 								</div>
 							</c:if>
-							
+						
 							<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 loffset5" value="<fmt:message key="admin.save" />" />