diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm
index 809c52959..2038b0b47 100644
--- a/lib/WebGUI/Account/FriendManager.pm
+++ b/lib/WebGUI/Account/FriendManager.pm
@@ -293,7 +293,9 @@ sub www_getFriendsAsJson  {
     my @records = ();
     my $groups = $session->setting->get('groupsToManageFriends');
     my @groupIds = split "\n", $groups;
-    @groupIds = grep { $_ ne $groupId } @groupIds;
+    if (scalar @groupIds > 1) {
+        @groupIds = grep { $_ ne $groupId } @groupIds;
+    }
     my $groupNames = join "\n",
                         map { $_->name }
                         map { WebGUI::Group->new($session, $_) }
@@ -341,7 +343,7 @@ sub www_getFriendsAsJson  {
 
 =head2 www_view ( )
 
-The main view page for editing the user's profile.
+The main view page for editing the user's friends.
 
 =cut
 
diff --git a/www/extras/yui-webgui/build/friendManager/friendManager.js b/www/extras/yui-webgui/build/friendManager/friendManager.js
index 0aabf67e9..b44537dcb 100644
--- a/www/extras/yui-webgui/build/friendManager/friendManager.js
+++ b/www/extras/yui-webgui/build/friendManager/friendManager.js
@@ -61,12 +61,14 @@ WebGUI.FriendManager.formatUsername = function ( el, oRecord, oColumn, oData ) {
 
 WebGUI.FriendManager.formatGroups = function ( el, oRecord, oColumn, oData ) {
     var userId = oRecord.getData('userId');
-    el.innerHTML = '<a href="?op=account;module=friendManager;do=editFriends;userId=' + userId + '">Edit all</a>';
+    el.innerHTML = '';
     var groups = oData.split("\n");
     for (var idx=0; idx < groups.length; idx++) {
         var group     = groups[idx];
         var groupUri  = encodeURI(group);
-        el.innerHTML += ' ';
+        if (el.innerHTML) {
+            el.innerHTML += ' ';
+        }
         el.innerHTML += '<a href="?op=account;module=friendManager;do=editFriends;userId=' + userId + ';groupName='+groupUri+'">'+group+'</a>';
     }
 }