diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 028139c8b..775c2da82 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fixed #11884: Editing Templates impossible / Code editor not loaded
  - recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked. 
  - fixed #11883: Wiki "Add page" link does not encode special chars
+ - fixed #11886: profile knows it's me, but doesn't display edit
 
 7.10.1
  - fixed #11851: Story Topic: top story variables should be available all the time
diff --git a/docs/templates.txt b/docs/templates.txt
index 19187a088..c29a10cb0 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -3,6 +3,10 @@ templates, you will need to apply these changes manually to your copies.
 
 7.10.1
 
+  *  Profile templates - root/import/account/profile/default-view-profile-template
+                       - root/import/account/profile/profile-account-layout
+     Moved the "back to profile" link from the Profile View template to the Profile Layout template.
+
   *  Asset Report Template - asset-report/asset-report-default-template
      Remove the empty template attachment
 
diff --git a/docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg b/docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg
new file mode 100644
index 000000000..f609b3d3b
Binary files /dev/null and b/docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg differ
diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm
index e5ff26d19..2daed6b2e 100644
--- a/lib/WebGUI/Account/Profile.pm
+++ b/lib/WebGUI/Account/Profile.pm
@@ -83,7 +83,8 @@ sub appendCategoryVars {
     $var->{'profile_category_'.$categoryId."_shortLabel"} = $shortCategoryLabel;
     $var->{'profile_category_'.$categoryId."_index"     } = $index;
     $var->{'profile_category_'.$categoryId."_fields"    } = $fields;
-    
+
+    $var->{'can_edit_profile'  } = $self->uid eq $self->session->user->userId;
 
     #Update the isActive flag to determine the default active tab
     $self->store->{hasActiveTab} = ($self->store->{hasActiveTab} || $isActive);
@@ -472,8 +473,6 @@ sub www_view {
 
     $self->appendCommonVars($var);
 
-    $var->{'can_edit_profile'  } = $uid eq $session->user->userId;
-
     my $privacySetting = $user->profileField('publicProfile') || 'none';
     $var->{"profile_privacy_$privacySetting"} = "true";