Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r607eac9284ea4c4cb88f03805d5945fe27277244
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 607eac9284ea4c4cb88f03805d5945fe27277244)
@@ -16,7 +16,6 @@
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 	
-
 <lams:html>
 <lams:head>
 	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
@@ -39,7 +38,6 @@
 					</c:if>
 			});
 			
-			
 		$.validator.addMethod("charactersAllowed", function(value) {
 				return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/.test(value)
 			
@@ -154,9 +152,7 @@
 									placeholder="<fmt:message key='label.password.confirm.new.password' />" maxlength="25"/>
 							</div>
 							<div class="form-group" align="right">
-								<html:cancel styleClass="btn btn-sm btn-default voffset5">
-									<fmt:message key="button.cancel" />
-								</html:cancel>
+							<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="<fmt:message key="button.cancel"/>" formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-sm btn-default voffset5"/>
 								&nbsp;&nbsp;
 								<html:submit styleClass="btn btn-sm btn-primary voffset5">
 									<fmt:message key="button.save" />
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r607eac9284ea4c4cb88f03805d5945fe27277244
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 607eac9284ea4c4cb88f03805d5945fe27277244)
@@ -206,6 +206,10 @@
 			    </div>
 			  </div>
 		</div>
+		<div align="right">
+		<a class="btn btn-sm btn-file btn-default offset5" role="button"
+								href="<c:url value='/index.do'/>?method=profile"><fmt:message
+									key="button.cancel" /></a></div>
 	</div>
 </div>
 </div>