diff --git a/seahub/templates/sysadmin/useradmin_table.html b/seahub/templates/sysadmin/useradmin_table.html
index a0f2b4f129..f5d961a109 100644
--- a/seahub/templates/sysadmin/useradmin_table.html
+++ b/seahub/templates/sysadmin/useradmin_table.html
@@ -11,7 +11,11 @@
 
     {% for user in users %}
     <tr data-userid="{{user.email}}">
-        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
+        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a>
+        {% if user.org %}
+        <p style="font-size:11px;"><a href="{% url 'sys_org_info' user.org.org_id %}">({{user.org.org_name}})</a></p>
+        {% endif %}
+        </td>
         <td>
           {% if user.source != 'LDAP' %}
             <div class="user-status">
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 8e96eaf26a..ba70384023 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -181,7 +181,8 @@ def sys_user_admin(request):
                 user.share_usage = seafile_api.get_user_share_usage(user.email)
                 user.quota = seafile_api.get_user_quota(user.email)
             else:
-                org_id = org[0].org_id
+                user.org = org[0]
+                org_id = user.org.org_id
                 user.self_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email)
                 user.share_usage = 0 #seafile_api.get_user_share_usage(user.email)
                 user.quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email)
@@ -879,10 +880,18 @@ def user_search(request):
     users = ccnet_threaded_rpc.search_emailusers(email, -1, -1)
     last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users])
     for user in users:
+        org = ccnet_threaded_rpc.get_orgs_by_user(user.email)
         try:
-            user.self_usage = seafile_api.get_user_self_usage(user.email)
-            user.share_usage = seafile_api.get_user_share_usage(user.email)
-            user.quota = seafile_api.get_user_quota(user.email)
+            if not org:
+                user.self_usage = seafile_api.get_user_self_usage(user.email)
+                user.share_usage = seafile_api.get_user_share_usage(user.email)
+                user.quota = seafile_api.get_user_quota(user.email)
+            else:
+                user.org = org[0]
+                org_id = user.org.org_id
+                user.self_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email)
+                user.share_usage = 0
+                user.quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email)
         except SearpcError as e:
             logger.error(e)
             user.self_usage = -1