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>