diff --git a/src/locales/en-US/common.ts b/src/locales/en-US/common.ts
index 6449bf32..3c7a3a3c 100644
--- a/src/locales/en-US/common.ts
+++ b/src/locales/en-US/common.ts
@@ -66,6 +66,7 @@ export default {
   'common.search.name.placeholder': 'filter by name',
   'common.search.id.placeholder': 'filter by ID',
   'common.filter.byId': 'filter by ID',
+  'common.filter.byCreator': 'Filter by creator',
   'common.table.type': 'Type',
   'common.table.default': 'Default Value',
   'common.copy.success': 'Copied success!',
diff --git a/src/locales/ja-JP/common.ts b/src/locales/ja-JP/common.ts
index 68bfed19..f8ead094 100644
--- a/src/locales/ja-JP/common.ts
+++ b/src/locales/ja-JP/common.ts
@@ -66,6 +66,7 @@ export default {
   'common.search.name.placeholder': '名前でフィルタ',
   'common.search.id.placeholder': 'IDでフィルタ',
   'common.filter.byId': 'IDでフィルタ',
+  'common.filter.byCreator': '作成者でフィルタ',
   'common.table.type': 'タイプ',
   'common.table.default': 'デフォルト値',
   'common.copy.success': 'コピー成功！',
diff --git a/src/locales/ru-RU/common.ts b/src/locales/ru-RU/common.ts
index b9fa78ec..22036871 100644
--- a/src/locales/ru-RU/common.ts
+++ b/src/locales/ru-RU/common.ts
@@ -66,6 +66,7 @@ export default {
   'common.search.name.placeholder': 'Фильтр по названию',
   'common.search.id.placeholder': 'Фильтр по ID',
   'common.filter.byId': 'Фильтр по ID',
+  'common.filter.byCreator': 'Фильтр по создателю',
   'common.table.type': 'Тип',
   'common.table.default': 'Значение по умолчанию',
   'common.copy.success': 'Скопировано!',
diff --git a/src/locales/tr-TR/common.ts b/src/locales/tr-TR/common.ts
index c92cfaa1..df7475a9 100644
--- a/src/locales/tr-TR/common.ts
+++ b/src/locales/tr-TR/common.ts
@@ -66,6 +66,7 @@ export default {
   'common.search.name.placeholder': 'ada göre filtrele',
   'common.search.id.placeholder': 'kimliğe göre filtrele',
   'common.filter.byId': 'kimliğe göre filtrele',
+  'common.filter.byCreator': 'Oluşturana göre filtrele',
   'common.table.type': 'Tür',
   'common.table.default': 'Varsayılan Değer',
   'common.copy.success': 'Kopyalama başarılı!',
diff --git a/src/locales/zh-CN/common.ts b/src/locales/zh-CN/common.ts
index 9b49cca0..786694d3 100644
--- a/src/locales/zh-CN/common.ts
+++ b/src/locales/zh-CN/common.ts
@@ -233,6 +233,7 @@ export default {
   'common.text.tips': '提示',
   'settings.system': '系统设置',
   'common.filter.byId': '按 ID 查询',
+  'common.filter.byCreator': '按创建者筛选',
   'common.appearance': '外观',
   'common.appearance.dark': '深色',
   'common.appearance.light': '浅色',
diff --git a/src/pages/api-keys/hooks/use-keys-columns.tsx b/src/pages/api-keys/hooks/use-keys-columns.tsx
index 90a91dec..774b158e 100644
--- a/src/pages/api-keys/hooks/use-keys-columns.tsx
+++ b/src/pages/api-keys/hooks/use-keys-columns.tsx
@@ -18,7 +18,10 @@ type RankedAction = APIKeyAction & { priority: number };
 interface ColumnsHookProps {
   handleSelect: (val: string, record: ListItem, item?: APIKeyAction) => void;
   sortOrder: string[];
-  is_admin?: boolean;
+  // Reveal the Creator column to callers who can see other users' keys
+  // (platform admin or current-Org owner). Members only see their own
+  // keys, so the column would be redundant for them.
+  showCreator?: boolean;
   configActions?: APIKeyConfigAction[];
   // Dispatches the click for a plugin-contributed dropdown entry to the
   // controller `useCreate()` returned for that entry.
@@ -28,7 +31,7 @@ interface ColumnsHookProps {
 const useModelsColumns = ({
   handleSelect,
   sortOrder,
-  is_admin,
+  showCreator,
   configActions = [],
   onConfigAction
 }: ColumnsHookProps): ColumnsType<ListItem> => {
@@ -180,7 +183,7 @@ const useModelsColumns = ({
         title: intl.formatMessage({ id: 'common.table.creator' }),
         dataIndex: 'user_name',
         key: 'user_name',
-        hidden: !is_admin,
+        hidden: !showCreator,
         render: (text: string) => (
           <AutoTooltip ghost style={{ maxWidth: 200 }}>
             {text || '-'}
@@ -216,7 +219,7 @@ const useModelsColumns = ({
         )
       }
     ];
-  }, [intl, is_admin, handleSelect, actionList]);
+  }, [intl, showCreator, handleSelect, actionList]);
 };
 
 export default useModelsColumns;
diff --git a/src/pages/api-keys/index.tsx b/src/pages/api-keys/index.tsx
index 8a52f821..0e3e923c 100644
--- a/src/pages/api-keys/index.tsx
+++ b/src/pages/api-keys/index.tsx
@@ -3,9 +3,8 @@ import { PaginationKey } from '@/config/settings';
 import type { PageActionType } from '@/config/types';
 import useTableFetch from '@/hooks/use-table-fetch';
 import useQueryUserList from '@/pages/users/services/use-query-user-list';
-import { useModel } from '@@/plugin-model';
 import { DeleteModal, FilterBar, IconFont, NoResult } from '@gpustack/core-ui';
-import { useIntl } from '@umijs/max';
+import { useAccess, useIntl } from '@umijs/max';
 import useMemoizedFn from 'ahooks/lib/useMemoizedFn';
 import { ConfigProvider, Table } from 'antd';
 import _ from 'lodash';
@@ -22,8 +21,12 @@ import {
 } from './plugin';
 
 const APIKeys: React.FC = () => {
-  const { initialState } = useModel('@@initialState');
-  const currentUser = initialState?.currentUser;
+  const access = useAccess();
+  // `canSeeOrgAdmin` widens to Org owners in the enterprise build —
+  // mirrors the BE's "platform admin OR current-Org owner" gate on
+  // listing every key in scope. Personal/member users continue to see
+  // only their own keys (`user_id: undefined`).
+  const canSeeAllKeys = !!access.canSeeOrgAdmin;
   const {
     TABLE_SORT_DIRECTIONS,
     dataSource,
@@ -45,7 +48,7 @@ const APIKeys: React.FC = () => {
     deleteAPI: deleteApisKey,
     contentForDelete: 'apikeys.table.apikeys',
     defaultQueryParams: {
-      user_id: currentUser?.is_admin ? '*' : undefined
+      user_id: canSeeAllKeys ? '*' : undefined
     }
   });
   const {
@@ -198,7 +201,7 @@ const APIKeys: React.FC = () => {
   const columns = useKeysColumns({
     handleSelect: onSelect,
     sortOrder,
-    is_admin: currentUser?.is_admin,
+    showCreator: canSeeAllKeys,
     configActions,
     onConfigAction: handleConfigAction
   });
@@ -209,10 +212,10 @@ const APIKeys: React.FC = () => {
         <FilterBar
           marginBottom={22}
           marginTop={30}
-          showSelect={currentUser?.is_admin}
+          showSelect={canSeeAllKeys}
           selectOptions={userList}
           select={{ showSearch: { optionFilterProp: 'label' } }}
-          selectHolder={intl.formatMessage({ id: 'models.table.filterByName' })}
+          selectHolder={intl.formatMessage({ id: 'common.filter.byCreator' })}
           buttonText={intl.formatMessage({ id: 'apikeys.button.create' })}
           handleSearch={handleSearch}
           handleDeleteByBatch={handleDeleteBatch}
diff --git a/src/pages/users/services/use-query-user-list.ts b/src/pages/users/services/use-query-user-list.ts
index 58b16676..a2a966a5 100644
--- a/src/pages/users/services/use-query-user-list.ts
+++ b/src/pages/users/services/use-query-user-list.ts
@@ -1,25 +1,29 @@
 import { useQueryDataList } from '@/hooks/use-query-data-list';
-import { useModel } from '@@/plugin-model';
-import { queryUsersList } from '../apis';
+import { useAccess } from '@umijs/max';
+import { queryUserDirectory } from '../apis';
 import { ListItem } from '../config/types';
 
+// Backed by `/user-directory`, which the BE opens to platform admin AND
+// Org owners (the admin-only `/users` endpoint would 403 the latter).
+// `canSeeOrgAdmin` mirrors the same gate on the FE so non-admin Org
+// owners can populate user pickers without hitting an error.
 export const useQueryUserList = (optons?: {
   getLabel?: (item: ListItem) => string;
   getValue?: (item: ListItem) => any;
 }) => {
-  const { initialState } = useModel('@@initialState');
+  const access = useAccess();
   const { dataList, loading, fetchData, cancelRequest } = useQueryDataList<
     ListItem,
     Global.SearchParams
   >({
     key: 'userList',
-    fetchList: queryUsersList,
+    fetchList: queryUserDirectory,
     getLabel: optons?.getLabel,
     getValue: optons?.getValue
   });
 
   const fetchUserList = (params: Global.SearchParams) => {
-    if (!initialState?.currentUser?.is_admin) return;
+    if (!access.canSeeOrgAdmin) return;
     return fetchData({
       ...params
     });