Index: lams_admin/web/user.jsp
===================================================================
diff -u -rf2766ffdd75ea0e921c5cf17cbd257cd36b76097 -r6b09352f0035857637c5accfa2ffc66a4385f120
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision f2766ffdd75ea0e921c5cf17cbd257cd36b76097)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 6b09352f0035857637c5accfa2ffc66a4385f120)
@@ -525,10 +525,9 @@
 			</div>
 
 
-			<c:if test="${isAppadmin}">
 			<div class="row">
 				<div class="col-6 offset-3 text-end">
-					<c:if test="${not empty userForm.userId}">
+					<c:if test="${isAppadmin and not empty userForm.userId}">
 						<a	href="<lams:LAMSURL/>admin/userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}"
 							  class="btn btn-primary float-start">
 							<fmt:message key="admin.user.changePassword" />
@@ -542,9 +541,7 @@
 								value="<fmt:message key="admin.save" />" />
 				</div>
 			</div>
-			</c:if>
 
-
 			</form:form>
 			<!-- End of panel -->