diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index acf7de02e..3f1f89b9c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -56,6 +56,7 @@
  - rfe: Added sort order to Folder assets
  - rfe: Added canEdit and canAddFile template vars to Folder assets
  - rfe: Add logged-in time to Login History
+ - rfe: cancel button (for edit profile screen)
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg b/docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg
new file mode 100644
index 000000000..84b43704b
Binary files /dev/null and b/docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg differ
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index 901f50e9f..ae2f4437b 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -225,12 +225,16 @@ sub www_editProfile {
 				});
 		}
 		push(@array, {
-			'profile.form.category' => $category->getLabel,
-                        'profile.form.category.loop' => \@temp
-			});
+            'profile.form.category' => $category->getLabel,
+            'profile.form.category.loop' => \@temp
+        });
 	}
 	$vars->{'profile.form.elements'} = \@array;
 	$vars->{'profile.form.submit'} = WebGUI::Form::submit($session,{});
+	$vars->{'profile.form.cancel'} = WebGUI::Form::button($session,{
+        value => $i18n->get('cancel'),
+        extras=>q|onclick="history.go(-1);" class="backwardButton"|,
+    });
 	$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions($session);
 	return $session->style->userStyle(WebGUI::Asset::Template->new($session, $session->setting->get('editUserProfileTemplate'))->process($vars));
 }