diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index da376a3fb..7e439c1f4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -269,6 +269,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         urls.put("theme", UrlBuilder.getUrl(themeDir));
         urls.put("index", UrlBuilder.getUrl("/browse"));   
         urls.put("currentPage", getCurrentPageUrl(vreq));
+        urls.put("referringPage", getReferringPageUrl(vreq));
         
 		if (PolicyHelper.isAuthorizedForActions(vreq, new EditOwnAccount())) {
 			urls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
@@ -286,6 +287,11 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         path = normalizeServletName(path);        
         return UrlBuilder.getUrl(path);
     }
+    
+    private String getReferringPageUrl(HttpServletRequest request) {
+		String referrer = request.getHeader("referer");
+		return (referrer == null) ? UrlBuilder.getHomeUrl() : referrer;
+    }
 
     protected TemplateModel wrap(Object obj, int exposureLevel) throws TemplateModelException {
         BeansWrapper wrapper = getBeansWrapper(exposureLevel);
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index fd419789b..5ffcf2f58 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -80,7 +80,7 @@
             <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
         </#if>
 
-        <p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /></p>
+        <p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /> or <a class="cancel" href="${urls.referringPage}">Cancel</a></p>
 
         <p class="requiredHint">* required fields</p>
     </form>