diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 67c838d4ba..690cd1b414 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -234,6 +234,7 @@ app["pageOptions"] = {
         return mods_enabled;
     })(),
     username: "{{request.user.username}}",
+    name: "{{request.user.username|email2nickname|escapejs}}",
     events_enabled: {% if events_enabled %} true {% else %} false {% endif %},
     can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %},
     can_generate_shared_link: {% if user.permissions.can_generate_shared_link %} true {% else %} false {% endif %},
diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py
index 7a91e6f39d..431a3adc23 100644
--- a/seahub/views/ajax.py
+++ b/seahub/views/ajax.py
@@ -508,6 +508,7 @@ def list_lib_dir(request, repo_id):
         if is_pro_version():
             f_['is_locked'] = True if f.is_locked else False
             f_['lock_owner'] = f.lock_owner
+            f_['lock_owner_name'] = email2nickname(f.lock_owner)
             if username == f.lock_owner:
                 f_['locked_by_me'] = True
             else:
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 8592352265..3793083412 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -55,7 +55,7 @@ define([
                 enable_some_op: enable_some_op,
                 repo_encrypted: dir.encrypted
             }));
-            this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', Common.HTMLescape(this.model.get('lock_owner'))));
+            this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', this.model.get('lock_owner_name')));
 
             return this;
         },
@@ -503,7 +503,7 @@ define([
                     _this.model.set({
                         'is_locked': true,
                         'locked_by_me': true,
-                        'lock_owner': app.pageOptions.username
+                        'lock_owner_name': app.pageOptions.name
                     });
                     app.globalState.noFileOpPopup = true;
                     _this.$el.removeClass('hl');