diff --git a/lib/WebGUI/i18n/English/Account_FriendManager.pm b/lib/WebGUI/i18n/English/Account_FriendManager.pm
index fd54a01f8..4fbc13e42 100644
--- a/lib/WebGUI/i18n/English/Account_FriendManager.pm
+++ b/lib/WebGUI/i18n/English/Account_FriendManager.pm
@@ -185,6 +185,11 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'friends count' => {
+        message     => q{Friends Count},
+        lastUpdated => 0,
+    },
+
 };
 
 1;
diff --git a/sbin/packages/root_import_account_friendmanager.wgpkg b/sbin/packages/root_import_account_friendmanager.wgpkg
index f3015ae42..956a30869 100644
Binary files a/sbin/packages/root_import_account_friendmanager.wgpkg and b/sbin/packages/root_import_account_friendmanager.wgpkg differ
diff --git a/www/extras/yui-webgui/build/friendManager/friendManager.js b/www/extras/yui-webgui/build/friendManager/friendManager.js
index b44537dcb..dad4ad717 100644
--- a/www/extras/yui-webgui/build/friendManager/friendManager.js
+++ b/www/extras/yui-webgui/build/friendManager/friendManager.js
@@ -1,7 +1,5 @@
-/*** The WebGUI Asset History Viewer 
+/*** The WebGUI Friend Manager
  * Requires: YAHOO, Dom, Event
- * With all due credit to Doug Bell, who wrote the AssetManager.  FriendManager
- * is a blatant copy/paste/modify of it.
  */
 
 //Container for functions used by many datatables.
@@ -17,24 +15,29 @@ if ( typeof WebGUI.FriendManager.tables == "undefined" ) {
 
 /*---------------------------------------------------------------------------
     WebGUI.FriendManager.initManager ( )
-    Initialize the i18n interface
-WebGUI.FriendManager.initManager = function (o) {
-    WebGUI.FriendManager.i18n
-    = new WebGUI.i18n( { 
-            namespaces  : {
-                'WebGUI' : [
-                    "50",
-                ],
-                'Account_Friends' : [
-                    "title",
-                ]
-            },
-            onpreload   : {
-                fn       : WebGUI.FriendManager.init
-            }
-        } );
-};
+    Initialize the i18n interface, and then call the function to build
+    the DataTables.
 */
+WebGUI.FriendManager.initI18N = function (o) {
+    WebGUI.FriendManager.i18n
+        = new WebGUI.i18n( { 
+                namespaces  : {
+                    "WebGUI" : [
+                        "50",
+                        "89",
+                    ],
+                    "Account_Friends" : [
+                        "title",
+                    ],
+                    "Account_FriendManager" : [
+                        "friends count",
+                    ]
+                },
+                onpreload   : {
+                    fn       : WebGUI.FriendManager.initTables
+                }
+            } );
+};
 
 /*---------------------------------------------------------------------------
     Initialize objects that are shared across many datatables.
@@ -73,21 +76,25 @@ WebGUI.FriendManager.formatGroups = function ( el, oRecord, oColumn, oData ) {
     }
 }
 
-WebGUI.FriendManager.ColumnDefs = [ // sortable:true enables sorting
-    //{key:"username",    label:WebGUI.FriendManager.i18n.get('WebGUI', '50' ),             sortable: true},
-    //{key:"friends",     label:WebGUI.FriendManager.i18n.get('Account_Friends', 'title' ), sortable: true},
-    {key:"groups",       label:"groups",       sortable: false, formatter: WebGUI.FriendManager.formatGroups },
-    {key:"username",     label:"username",     sortable: true, formatter: WebGUI.FriendManager.formatUsername },
-    {key:"friendsCount", label:"friendsCount", sortable: true},
-    {key:"friends",      label:"friends",      sortable: false},
-    {key:"userId",       label:"userId",       sortable: true},
-];
-
 //Per object code
 
 WebGUI.FriendManager.MakeTable = function (groupId, containerId) {
     var that = this;
 
+    if (typeof WebGUI.FriendManager.ColumnDefs == "undefined" ) {
+        WebGUI.FriendManager.ColumnDefs = [ // sortable:true enables sorting
+            { key:"groups",       sortable: false, formatter: WebGUI.FriendManager.formatGroups,
+              label:WebGUI.FriendManager.i18n.get('WebGUI', '89' ), },
+            { key:"username",     sortable: true,  formatter: WebGUI.FriendManager.formatUsername,
+              label:WebGUI.FriendManager.i18n.get('WebGUI', '50' ), },
+            { key:"friendsCount", sortable: true,
+              label:WebGUI.FriendManager.i18n.get('Account_FriendManager', 'friends count' ), },
+            { key:"friends",      sortable: false,
+              label:WebGUI.FriendManager.i18n.get('Account_Friends', 'title' ), },
+            { key:"userId",       label:"userId",       sortable: true},
+        ];
+    }
+
     // Initialize the data table
     var myPaginator = new YAHOO.widget.Paginator({
         containers            : ['pagination'],