diff --git a/frontend/src/pages/org-admin/org-user-item.js b/frontend/src/pages/org-admin/org-user-item.js
index 615bfe4b5e..3ceb17da13 100644
--- a/frontend/src/pages/org-admin/org-user-item.js
+++ b/frontend/src/pages/org-admin/org-user-item.js
@@ -52,7 +52,8 @@ class UserItem extends React.Component {
 
   toggleDelete = () => {
     const email = this.props.user.email;
-    this.props.toggleDelete(email);
+    const username = this.props.user.name;
+    this.props.toggleDelete(email, username);
   };
 
   toggleResetPW = () => {
diff --git a/frontend/src/pages/org-admin/org-users-admins.js b/frontend/src/pages/org-admin/org-users-admins.js
index ca895b0b42..afd2d7475f 100644
--- a/frontend/src/pages/org-admin/org-users-admins.js
+++ b/frontend/src/pages/org-admin/org-users-admins.js
@@ -36,13 +36,13 @@ class OrgUsers extends Component {
     });
   };
 
-  toggleOrgAdminDelete = (email) => {
+  toggleOrgAdminDelete = (email, username) => {
     seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
       this.setState({
         orgAdminUsers: this.state.orgAdminUsers.filter(item => item.email != email)
       });
-      let msg = gettext('Successfully deleted %s');
-      msg = msg.replace('%s', email);
+      let msg = gettext('Deleted user %s');
+      msg = msg.replace('%s', username);
       toaster.success(msg);
     }).catch(error => {
       let errMessage = Utils.getErrorMsg(error);
diff --git a/frontend/src/pages/org-admin/org-users-search-users.js b/frontend/src/pages/org-admin/org-users-search-users.js
index 549c16656f..86dc48d587 100644
--- a/frontend/src/pages/org-admin/org-users-search-users.js
+++ b/frontend/src/pages/org-admin/org-users-search-users.js
@@ -104,13 +104,15 @@ class OrgUsersSearchUsers extends Component {
     });
   };
 
-  deleteUser = (email) => {
+  deleteUser = (email, username) => {
     seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
       let newUserList = this.state.orgUsers.filter(item => {
         return item.email != email;
       });
       this.setState({orgUsers: newUserList});
-      toaster.success(gettext('Successfully deleted 1 item.'));
+      let msg = gettext('Deleted user %s');
+      msg = msg.replace('%s', username);
+      toaster.success(msg);
     }).catch((error) => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);
diff --git a/frontend/src/pages/org-admin/org-users-users.js b/frontend/src/pages/org-admin/org-users-users.js
index 4e5e75bd56..9f17e1756b 100644
--- a/frontend/src/pages/org-admin/org-users-users.js
+++ b/frontend/src/pages/org-admin/org-users-users.js
@@ -189,12 +189,12 @@ class OrgUsers extends Component {
     });
   };
 
-  toggleOrgUsersDelete = (email) => {
+  toggleOrgUsersDelete = (email, username) => {
     seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
       let users = this.state.orgUsers.filter(item => item.email != email);
       this.setState({orgUsers: users});
-      let msg = gettext('Successfully deleted %s');
-      msg = msg.replace('%s', email);
+      let msg = gettext('Deleted user %s');
+      msg = msg.replace('%s', username);
       toaster.success(msg);
     }).catch(error => {
       let errMessage = Utils.getErrorMsg(error);
diff --git a/frontend/src/pages/sys-admin/users/search-users.js b/frontend/src/pages/sys-admin/users/search-users.js
index 912431aa23..2c113081c3 100644
--- a/frontend/src/pages/sys-admin/users/search-users.js
+++ b/frontend/src/pages/sys-admin/users/search-users.js
@@ -134,13 +134,15 @@ class SearchUsers extends Component {
     });
   };
 
-  deleteUser = (email) => {
+  deleteUser = (email, username) => {
     seafileAPI.sysAdminDeleteUser(email).then(res => {
       let newUserList = this.state.userList.filter(item => {
         return item.email != email;
       });
       this.setState({userList: newUserList});
-      toaster.success(gettext('Successfully deleted 1 item.'));
+      let msg = gettext('Deleted user %s');
+      msg = msg.replace('%s', username);
+      toaster.success(msg);
     }).catch((error) => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);
diff --git a/frontend/src/pages/sys-admin/users/users-content.js b/frontend/src/pages/sys-admin/users/users-content.js
index 4714c02a5f..239c456ea0 100644
--- a/frontend/src/pages/sys-admin/users/users-content.js
+++ b/frontend/src/pages/sys-admin/users/users-content.js
@@ -292,7 +292,7 @@ class Item extends Component {
 
   deleteUser = () => {
     toaster.notify(gettext('It may take some time, please wait.'));
-    this.props.deleteUser(this.props.item.email);
+    this.props.deleteUser(this.props.item.email, this.props.item.name);
   };
 
   resetPassword = () => {
diff --git a/frontend/src/pages/sys-admin/users/users.js b/frontend/src/pages/sys-admin/users/users.js
index ced6b83230..598ef5a380 100644
--- a/frontend/src/pages/sys-admin/users/users.js
+++ b/frontend/src/pages/sys-admin/users/users.js
@@ -197,13 +197,15 @@ class Users extends Component {
     });
   };
 
-  deleteUser = (email) => {
+  deleteUser = (email, username) => {
     seafileAPI.sysAdminDeleteUser(email).then(res => {
       let newUserList = this.state.userList.filter(item => {
         return item.email != email;
       });
       this.setState({userList: newUserList});
-      toaster.success(gettext('Successfully deleted 1 item.'));
+      let msg = gettext('Deleted user %s');
+      msg = msg.replace('%s', username);
+      toaster.success(msg);
     }).catch((error) => {
       let errMessage = Utils.getErrorMsg(error);
       toaster.danger(errMessage);
diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py
index d396cd614a..fdfccadec0 100644
--- a/seahub/base/templatetags/seahub_tags.py
+++ b/seahub/base/templatetags/seahub_tags.py
@@ -369,7 +369,8 @@ def email2nickname(value):
     if profile is not None and profile.nickname and profile.nickname.strip():
         nickname = profile.nickname.strip()
     else:
-        nickname = value.split('@')[0]
+        contact_email = email2contact_email(value)
+        nickname = contact_email.split('@')[0]
 
     cache.set(key, nickname, NICKNAME_CACHE_TIMEOUT)
     return nickname