Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -rae9912edeb82523d71d1e18df67ec5ee7e6301a8 -r75204c057bac36bbf938738fad5427650d997209
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision ae9912edeb82523d71d1e18df67ec5ee7e6301a8)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
@@ -103,9 +103,8 @@
 				<div class="panel voffset20">
 					<lams:errors/>
 					<div class="panel-body">
-					<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
-							<form:hidden name="<%=PasswordChangeActionForm.formName%>"
-								path="login" />
+						<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
+						<form:hidden name="<%=PasswordChangeActionForm.formName%>" path="login" />
 							<div class="form-group">
 								<label for="oldPassword"><fmt:message key="label.password.old.password" />:</label>
  								<lams:errors path="oldPassword"/>	
@@ -133,25 +132,27 @@
 								 </lams:Alert> 
 							</div>
 							
-							<lams:errors path="password"/>	
- 							<div class="input-group voffset5">
-								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
-								<input class="form-control" type="password"  
+						<lams:errors path="password"/>	
+ 						<div class="input-group voffset5">
+							<span class="input-group-addon"><i class="fa fa-lock"></i></span>
+							<input class="form-control" type="password"  
 									placeholder="<fmt:message key='label.password.new.password' />" id="password" name="password" maxlength="25"/> 			
-							</div>
-							<div class="input-group voffset5">
-								<span class="input-group-addon"><i class="fa fa-lock"></i></span>
-								<input class="form-control" type="password" id="passwordConfirm" name="passwordConfirm"
+						</div>
+						<div class="input-group voffset5">
+							<span class="input-group-addon"><i class="fa fa-lock"></i></span>
+							<input class="form-control" type="password" id="passwordConfirm" name="passwordConfirm"
 									placeholder="<fmt:message key='label.password.confirm.new.password' />" maxlength="25"/>
-							</div>
-							<div class="form-group" align="right">
-							<a href="/lams/profile.jsp" type="submit" id="cancelButton" class="btn btn-sm btn-default voffset5"><fmt:message key="button.cancel"/></a>
-								&nbsp;&nbsp;
-								<button class="btn btn-sm btn-primary voffset5">
-									<fmt:message key="button.save" />
-								</button>
-
-							</div>
+						</div>
+							
+						<div class="form-group" align="right">
+							<button type="button" id="cancelButton" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
+								<fmt:message key="button.cancel"/>
+							</button>
+							&nbsp;&nbsp;
+							<button type="submit" class="btn btn-sm btn-primary voffset5">
+								<fmt:message key="button.save" />
+							</button>
+						</div>
 					</div>
 
 				</div>
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5 -r75204c057bac36bbf938738fad5427650d997209
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 3ec6f7db6edbcd0d8a9e9ba89952ffe39df68eb5)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
@@ -356,8 +356,7 @@
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
 									<c:set var="timeZone">
-										<input type="text" class="form-control"
-											value="${UserForm.timeZone}" />
+										<input type="text" class="form-control" value="${UserForm.timeZone}" />
 									</c:set>
 									${timeZone}
 								</div>
@@ -369,12 +368,13 @@
 			</div>
 	</form:form>
 	<div class="form-group" align="right">
-		<a href="<lams:LAMSURL />profile.jsp"   class="btn btn-sm btn-default voffset5" >
-			<fmt:message key="button.cancel" /></a>
+		<button type="button" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
+			<fmt:message key="button.cancel" />
+		</button>
 		&nbsp;&nbsp;
 		<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
-			<button class="btn btn-sm btn-primary voffset5" type="button"
-				name="submit" onclick="submitMessage()"> 
+			<button type="button" class="btn btn-sm btn-primary voffset5" 
+					name="submit" onclick="submitMessage()"> 
 				<fmt:message key="button.save" />
 			</button>
 		</c:if>
Index: lams_central/web/profile/lessons.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r75204c057bac36bbf938738fad5427650d997209
--- lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
@@ -74,9 +74,9 @@
 					</div>
 					
 					<div align="center">
-						<input class="btn btn-sm btn-default offset5" type="button"
-							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='<lams:LAMSURL/>index.do?redirect=profile'" />
+						<button type="button" class="btn btn-sm btn-default offset5" onclick="history.go(-1);">
+							<fmt:message key="label.return.to.myprofile" />
+						</button>
 					</div>
 
 				</div>
Index: lams_central/web/profile/portrait.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r75204c057bac36bbf938738fad5427650d997209
--- lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
@@ -227,9 +227,9 @@
 
 		<c:if test="${!param.isReturnButtonHidden}">
 			<div align="right">
-				<a class="btn btn-sm btn-file btn-default offset5" role="button" href="<c:url value='/index.do?redirect=profile'/>">
+				<button type="button" class="btn btn-sm btn-file btn-default offset5" onclick="history.go(-1);">
 					<fmt:message key="label.return.to.myprofile" />
-				</a>
+				</button>
 			</div>
 		</c:if>
 	</div>
Index: lams_central/web/profile/profilePolicyConsents.jsp
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r75204c057bac36bbf938738fad5427650d997209
--- lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 75204c057bac36bbf938738fad5427650d997209)
@@ -93,9 +93,9 @@
 					</table>
 					
 					<div class="pull-right">
-						<input class="btn btn-sm btn-default offset5" type="button"
-							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='index.do?method=profile'" />
+						<button type="button" class="btn btn-sm btn-default offset5" onclick="history.go(-1);">
+							<fmt:message key="label.return.to.myprofile" />
+						</button>
 					</div>
 
 				</div>