diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm
index 2038b0b47..44bcf36e9 100644
--- a/lib/WebGUI/Account/FriendManager.pm
+++ b/lib/WebGUI/Account/FriendManager.pm
@@ -217,6 +217,10 @@ sub www_editFriends {
     if (! $groupName) {
         $var->{addManagers}  = WebGUI::Form::checkbox($session, { name => 'addManagers', value => 'addManagers', });
     }
+    if ($groupName) {
+        $var->{groupName}  = $groupName;
+        $var->{viewAllUrl} = $self->getUrl('module=friendManager;do=editFriends;userId='.$userId);
+    }
     return $self->processTemplate($var,$session->setting->get("fmEditTemplateId"));
 }
 
diff --git a/lib/WebGUI/i18n/English/Account_FriendManager.pm b/lib/WebGUI/i18n/English/Account_FriendManager.pm
index ead739a8b..fd54a01f8 100644
--- a/lib/WebGUI/i18n/English/Account_FriendManager.pm
+++ b/lib/WebGUI/i18n/English/Account_FriendManager.pm
@@ -180,6 +180,11 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'view users from all groups' => {
+        message     => q{View users from all groups.},
+        lastUpdated => 0,
+    },
+
 };
 
 1;
diff --git a/sbin/packages/root_import_account_friendmanager.wgpkg b/sbin/packages/root_import_account_friendmanager.wgpkg
index dd4d8d933..f3015ae42 100644
Binary files a/sbin/packages/root_import_account_friendmanager.wgpkg and b/sbin/packages/root_import_account_friendmanager.wgpkg differ