diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js
index 796f71b31a..950b699ec3 100644
--- a/frontend/src/components/common/account.js
+++ b/frontend/src/components/common/account.js
@@ -14,6 +14,7 @@ class Account extends Component {
       quotaUsage: '',
       quotaTotal: '',
       isStaff: false,
+      isOrgStaff: false,
       usageRate: '',
       avatarURL: '',
     };
@@ -79,6 +80,7 @@ class Account extends Component {
         quotaUsage: Utils.bytesToSize(resp.data.usage),
         quotaTotal: Utils.bytesToSize(resp.data.total),
         isStaff: resp.data.is_staff,
+        isOrgStaff: resp.data.is_org_staff === 1 ? true : false,
         avatarURL: resp.data.avatar_url
       });
     });
@@ -90,6 +92,11 @@ class Account extends Component {
         <a href={siteRoot + 'sys/useradmin/'} title={gettext('System Admin')} className="item">{gettext('System Admin')}</a>
       );
     }
+    if (this.state.isOrgStaff) {
+      return (
+        <a href={siteRoot + 'org/useradmin/'} title={gettext('Organization Admin')} className="item">{gettext('Organization Admin')}</a>
+      );
+    }
   }
 
   renderAvatar = () => {
diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index f0674184d5..678786dde7 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -300,6 +300,8 @@ class AccountInfo(APIView):
             org_id = request.user.org.org_id
             quota_total = seafile_api.get_org_user_quota(org_id, email)
             quota_usage = seafile_api.get_org_user_quota_usage(org_id, email)
+            is_org_staff = request.user.org.is_staff
+            info['is_org_staff'] = is_org_staff
         else:
             quota_total = seafile_api.get_user_quota(email)
             quota_usage = seafile_api.get_user_self_usage(email)