diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 657a482c6..cdb2ede8d 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -287,7 +287,7 @@ sub www_ajaxGetManagerPage {
             revisionDate    => $asset->get( "revisionDate" ),
             childCount      => $asset->getChildCount,
             assetSize       => $asset->get( 'assetSize' ),
-            lockedBy        => $asset->get( 'isLockedBy' ),
+            lockedBy        => ($asset->get( 'isLockedBy' ) ? $asset->lockedBy->username : ''),
             actions         => $asset->canEdit && $asset->canEditIfLocked,
         );
 
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index 52be5bba1..257e78871 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -1178,6 +1178,18 @@ Couldn't open %-s because %-s <br />
         context     => q{Error message in exportAsHtml for an illegal parameter.},
     },
 
+    'unlocked' => {
+        message     => q{unlocked},
+        lastUpdated => 0,
+        context     => q{Asset Manager label, when an asset is unlocked.},
+    },
+
+    'locked by' => {
+        message     => q{locked by},
+        lastUpdated => 0,
+        context     => q{Asset Manager label, as in "locked by admin"},
+    },
+
 };
 
 1;
diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js
index fbb6271b8..18c07a40a 100644
--- a/www/extras/yui-webgui/build/assetManager/assetManager.js
+++ b/www/extras/yui-webgui/build/assetManager/assetManager.js
@@ -151,12 +151,12 @@ WebGUI.AssetManager.formatLockedBy = function ( elCell, oRecord, oColumn, orderN
     elCell.innerHTML 
         = oRecord.getData( 'lockedBy' )
         ? '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
-            + '<img src="' + extras + '/assetManager/locked.gif" alt="locked by ' + oRecord.getData( 'lockedBy' ) + '" '
-            + 'title="locked by ' + oRecord.getData( 'lockedBy' ) + '" border="0" />'
+            + '<img src="' + extras + '/assetManager/locked.gif" alt="' + WebGUI.AssetManager.i18n.get('WebGUI', 'locked by') + ' ' + oRecord.getData( 'lockedBy' ) + '" '
+            + 'title="' + WebGUI.AssetManager.i18n.get('WebGUI', 'locked by') + ' ' + oRecord.getData( 'lockedBy' ) + '" border="0" />'
             + '</a>'
         : '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=manageRevisions') + '">'
-            + '<img src="' + extras + '/assetManager/unlocked.gif" alt="unlocked" '
-            + 'title="unlocked" border="0" />'
+            + '<img src="' + extras + '/assetManager/unlocked.gif" alt="' + WebGUI.AssetManager.i18n.get('WebGUI', 'unlocked') + '" '
+            + 'title="' + WebGUI.AssetManager.i18n.get('WebGUI', 'unlocked') +'" border="0" />'
             + '</a>'
         ;
 };
@@ -231,7 +231,9 @@ WebGUI.AssetManager.initManager = function (o) {
             namespaces  : {
                 'Asset' : [
                     "edit",
-                    "More"
+                    "More",
+                    "unlocked",
+                    "locked by"
                 ],
                 'WebGUI' : [
                     "< prev",