Index: lams_admin/web/user.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -501,12 +501,12 @@
 					<div class="col-md-12">
 						<c:if test="${not empty userForm.userId}">
 							<div class="pull-left">
-							<a href="./userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
+							<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>
+							<a href="<lams:LAMSURL/>admin/usersearch.do" 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" />" />
 						</div>
 					</div>