diff --git a/.gitignore b/.gitignore
index 191012ce..5b269838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ config/.generated/
 .npm-cache/
 reports
 reports/*
+/backups/
+/tmp/rp-restore-*/
 config/*.pem
 common/node_modules
 common/.baron-deps-install.lock
diff --git a/adminfront/src/features/tenants/hooks/useTenantPermission.test.tsx b/adminfront/src/features/tenants/hooks/useTenantPermission.test.tsx
index 9f9d20f3..5026242d 100644
--- a/adminfront/src/features/tenants/hooks/useTenantPermission.test.tsx
+++ b/adminfront/src/features/tenants/hooks/useTenantPermission.test.tsx
@@ -2,7 +2,12 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { render, renderHook, screen, waitFor } from "@testing-library/react";
 import type React from "react";
 import { describe, expect, it, vi } from "vitest";
-import { fetchMe, fetchTenant } from "../../../lib/adminApi";
+import {
+  fetchMe,
+  fetchTenant,
+  type TenantSummary,
+  type UserProfileResponse,
+} from "../../../lib/adminApi";
 import { TenantPermissionGuard } from "../components/TenantPermissionGuard";
 import { useTenantPermission } from "./useTenantPermission";
 
@@ -22,18 +27,52 @@ function createWrapper() {
   );
 }
 
+function mockProfile(
+  overrides: Partial<UserProfileResponse>,
+): UserProfileResponse {
+  return {
+    id: "user-id",
+    email: "user@example.com",
+    name: "Test User",
+    phone: "",
+    role: "user",
+    department: "",
+    affiliationType: "general",
+    ...overrides,
+  };
+}
+
+function mockTenant(overrides: Partial<TenantSummary>): TenantSummary {
+  return {
+    id: "tenant-id",
+    type: "COMPANY",
+    name: "Test Tenant",
+    slug: "test-tenant",
+    description: "",
+    status: "active",
+    memberCount: 0,
+    createdAt: "2026-01-01T00:00:00Z",
+    updatedAt: "2026-01-01T00:00:00Z",
+    ...overrides,
+  };
+}
+
 describe("useTenantPermission", () => {
   it("returns true for all permissions if user is super_admin", async () => {
-    vi.mocked(fetchMe).mockResolvedValue({
-      id: "user-super",
-      role: "super_admin",
-    } as any);
+    vi.mocked(fetchMe).mockResolvedValue(
+      mockProfile({
+        id: "user-super",
+        role: "super_admin",
+      }),
+    );
 
-    vi.mocked(fetchTenant).mockResolvedValue({
-      id: "tenant-1",
-      name: "Super Tenant",
-      userPermissions: { view: false, manage: false, manage_admins: false },
-    } as any);
+    vi.mocked(fetchTenant).mockResolvedValue(
+      mockTenant({
+        id: "tenant-1",
+        name: "Super Tenant",
+        userPermissions: { view: false, manage: false, manage_admins: false },
+      }),
+    );
 
     const { result } = renderHook(() => useTenantPermission("tenant-1"), {
       wrapper: createWrapper(),
@@ -49,16 +88,20 @@ describe("useTenantPermission", () => {
   });
 
   it("returns permissions mapped from userPermissions for normal admins/users", async () => {
-    vi.mocked(fetchMe).mockResolvedValue({
-      id: "user-admin",
-      role: "tenant_admin",
-    } as any);
+    vi.mocked(fetchMe).mockResolvedValue(
+      mockProfile({
+        id: "user-admin",
+        role: "tenant_admin",
+      }),
+    );
 
-    vi.mocked(fetchTenant).mockResolvedValue({
-      id: "tenant-2",
-      name: "Tenant Admin Corp",
-      userPermissions: { view: true, manage: true, manage_admins: false },
-    } as any);
+    vi.mocked(fetchTenant).mockResolvedValue(
+      mockTenant({
+        id: "tenant-2",
+        name: "Tenant Admin Corp",
+        userPermissions: { view: true, manage: true, manage_admins: false },
+      }),
+    );
 
     const { result } = renderHook(() => useTenantPermission("tenant-2"), {
       wrapper: createWrapper(),
@@ -76,15 +119,19 @@ describe("useTenantPermission", () => {
 
 describe("TenantPermissionGuard", () => {
   it("renders children when user has permission", async () => {
-    vi.mocked(fetchMe).mockResolvedValue({
-      id: "user-admin",
-      role: "tenant_admin",
-    } as any);
+    vi.mocked(fetchMe).mockResolvedValue(
+      mockProfile({
+        id: "user-admin",
+        role: "tenant_admin",
+      }),
+    );
 
-    vi.mocked(fetchTenant).mockResolvedValue({
-      id: "tenant-3",
-      userPermissions: { view: true, manage: true, manage_admins: false },
-    } as any);
+    vi.mocked(fetchTenant).mockResolvedValue(
+      mockTenant({
+        id: "tenant-3",
+        userPermissions: { view: true, manage: true, manage_admins: false },
+      }),
+    );
 
     render(
       <TenantPermissionGuard
@@ -104,15 +151,19 @@ describe("TenantPermissionGuard", () => {
   });
 
   it("renders fallback when user lacks permission", async () => {
-    vi.mocked(fetchMe).mockResolvedValue({
-      id: "user-admin",
-      role: "tenant_admin",
-    } as any);
+    vi.mocked(fetchMe).mockResolvedValue(
+      mockProfile({
+        id: "user-admin",
+        role: "tenant_admin",
+      }),
+    );
 
-    vi.mocked(fetchTenant).mockResolvedValue({
-      id: "tenant-4",
-      userPermissions: { view: true, manage: false, manage_admins: false },
-    } as any);
+    vi.mocked(fetchTenant).mockResolvedValue(
+      mockTenant({
+        id: "tenant-4",
+        userPermissions: { view: true, manage: false, manage_admins: false },
+      }),
+    );
 
     render(
       <TenantPermissionGuard
diff --git a/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.superAdmin.test.tsx b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.superAdmin.test.tsx
new file mode 100644
index 00000000..18149384
--- /dev/null
+++ b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.superAdmin.test.tsx
@@ -0,0 +1,129 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import type React from "react";
+import { MemoryRouter, Route, Routes } from "react-router-dom";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createI18nMock } from "../../../test/i18nMock";
+import { TenantFineGrainedPermissionsPage } from "./TenantFineGrainedPermissionsPage";
+
+const fetchUsersMock = vi.hoisted(() => vi.fn());
+const bulkUpdateUsersMock = vi.hoisted(() => vi.fn());
+
+vi.mock("../../../lib/i18n", () => createI18nMock());
+
+vi.mock("../../../lib/adminApi", () => ({
+  addSystemRelation: vi.fn(async () => undefined),
+  addTenantRelation: vi.fn(async () => undefined),
+  bulkUpdateUsers: bulkUpdateUsersMock,
+  fetchAllTenants: vi.fn(async () => ({ items: [], total: 0 })),
+  fetchMe: vi.fn(async () => ({
+    id: "current-admin",
+    name: "Current Admin",
+    email: "current@example.com",
+    role: "super_admin",
+  })),
+  fetchSystemRelations: vi.fn(async () => []),
+  fetchTenantRelations: vi.fn(async () => []),
+  fetchUsers: fetchUsersMock,
+  removeSystemRelation: vi.fn(async () => undefined),
+  removeTenantRelation: vi.fn(async () => undefined),
+}));
+
+function renderWithProviders(ui: React.ReactElement) {
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+      mutations: { retry: false },
+    },
+  });
+
+  return render(
+    <QueryClientProvider client={queryClient}>
+      <MemoryRouter initialEntries={["/permissions-direct"]}>{ui}</MemoryRouter>
+    </QueryClientProvider>,
+  );
+}
+
+describe("TenantFineGrainedPermissionsPage Super Admin role tab", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    bulkUpdateUsersMock.mockResolvedValue({ results: [] });
+    fetchUsersMock.mockResolvedValue({
+      items: [
+        {
+          id: "current-admin",
+          name: "Current Admin",
+          email: "current@example.com",
+          role: "super_admin",
+          status: "active",
+          createdAt: "2026-06-17T00:00:00Z",
+          updatedAt: "2026-06-17T00:00:00Z",
+        },
+        {
+          id: "bootstrap-admin",
+          name: "Bootstrap Admin",
+          email: "env-admin@example.com",
+          role: "super_admin",
+          status: "active",
+          metadata: { bootstrapSuperAdmin: true },
+          createdAt: "2026-06-17T00:00:00Z",
+          updatedAt: "2026-06-17T00:00:00Z",
+        },
+        {
+          id: "delegated-admin",
+          name: "Delegated Admin",
+          email: "delegated@example.com",
+          role: "super_admin",
+          status: "active",
+          createdAt: "2026-06-17T00:00:00Z",
+          updatedAt: "2026-06-17T00:00:00Z",
+        },
+        {
+          id: "regular-user",
+          name: "Regular User",
+          email: "regular@example.com",
+          role: "user",
+          status: "active",
+          createdAt: "2026-06-17T00:00:00Z",
+          updatedAt: "2026-06-17T00:00:00Z",
+        },
+      ],
+      total: 4,
+      limit: 1000,
+      offset: 0,
+    });
+  });
+
+  it("shows revocable super admin users even when they have no direct system relations", async () => {
+    renderWithProviders(
+      <Routes>
+        <Route
+          path="/permissions-direct"
+          element={<TenantFineGrainedPermissionsPage />}
+        />
+      </Routes>,
+    );
+
+    fireEvent.click(
+      await screen.findByRole("tab", { name: "Super Admin 역할" }),
+    );
+
+    expect(await screen.findByText("Delegated Admin")).toBeInTheDocument();
+    expect(screen.getByText("delegated@example.com")).toBeInTheDocument();
+    expect(screen.queryByText("Current Admin")).not.toBeInTheDocument();
+    expect(screen.queryByText("Bootstrap Admin")).not.toBeInTheDocument();
+    expect(screen.queryByText("Regular User")).not.toBeInTheDocument();
+
+    fireEvent.click(
+      screen.getByTestId("super-admin-role-user-delegated-admin"),
+    );
+    fireEvent.click(screen.getByRole("button", { name: "Super Admin 회수" }));
+
+    await waitFor(() =>
+      expect(bulkUpdateUsersMock).toHaveBeenCalledWith({
+        userIds: ["delegated-admin"],
+        role: "user",
+      }),
+    );
+  });
+});
diff --git a/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx
index dc0dbb2c..95e5f74a 100644
--- a/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx
@@ -8,7 +8,6 @@ import {
   LayoutDashboard,
   Network,
   NotebookTabs,
-  Plus,
   Search,
   Share2,
   Shield,
@@ -19,10 +18,8 @@ import {
 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { Avatar, AvatarFallback } from "../../../components/ui/avatar";
 import { Badge } from "../../../components/ui/badge";
 import { Button } from "../../../components/ui/button";
-import { Card, CardContent } from "../../../components/ui/card";
 import {
   Dialog,
   DialogContent,
@@ -31,7 +28,6 @@ import {
   DialogTitle,
 } from "../../../components/ui/dialog";
 import { Input } from "../../../components/ui/input";
-import { ScrollArea } from "../../../components/ui/scroll-area";
 import {
   Table,
   TableBody,
@@ -49,6 +45,7 @@ import {
   fetchMe,
   fetchSystemRelations,
   fetchTenantRelations,
+  fetchUsers,
   removeSystemRelation,
   removeTenantRelation,
   type TenantRelation,
@@ -66,6 +63,10 @@ const protectedSystemMenuRelations = new Set([
   "permissions_direct",
 ]);
 
+function isBootstrapSuperAdminUser(user: UserSummary) {
+  return user.metadata?.bootstrapSuperAdmin === true;
+}
+
 export function TenantFineGrainedPermissionsPage() {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
@@ -79,8 +80,7 @@ export function TenantFineGrainedPermissionsPage() {
   const [bulkRelationMode, setBulkRelationMode] = useState<
     "page" | "target-action"
   >("page");
-  const [bulkPageRelation, setBulkPageRelation] =
-    useState("overview_viewers");
+  const [bulkPageRelation, setBulkPageRelation] = useState("overview_viewers");
   const [bulkTenantPage, setBulkTenantPage] = useState("profile");
   const [bulkAction, setBulkAction] = useState<"read" | "manage">("read");
   const [tenantPickerOpen, setTenantPickerOpen] = useState(false);
@@ -94,15 +94,12 @@ export function TenantFineGrainedPermissionsPage() {
   >("user");
   const orgChartMemberPickerUrl = useMemo(
     () =>
-      buildAuthenticatedOrgChartUserMultiPickerUrl(import.meta.env.ORGFRONT_URL),
+      buildAuthenticatedOrgChartUserMultiPickerUrl(
+        import.meta.env.ORGFRONT_URL,
+      ),
     [],
   );
 
-  // 🌟 글로벌 시스템 드롭다운 즉각 변경을 위한 임시 로컬 맵 선언
-  const [localSystemPermissions, setLocalSystemPermissions] = useState<
-    Record<string, Record<string, "none" | "read" | "write">>
-  >({});
-
   const { data: profile } = useQuery({
     queryKey: ["me"],
     queryFn: fetchMe,
@@ -128,6 +125,30 @@ export function TenantFineGrainedPermissionsPage() {
   });
   const systemRelations = systemRelationsQuery.data ?? [];
 
+  const superAdminUsersQuery = useQuery({
+    queryKey: ["admin-users", "super-admin-role-candidates"],
+    queryFn: () => fetchUsers(10000, 0),
+    enabled: isSuperAdmin && activePermissionTab === "super-admin",
+  });
+
+  const revocableSuperAdminUsers = useMemo(() => {
+    const currentAdminId = profile?.id ?? "";
+    const currentAdminEmail = (profile?.email ?? "").trim().toLowerCase();
+
+    return (superAdminUsersQuery.data?.items ?? []).filter((user) => {
+      if (user.role !== "super_admin") {
+        return false;
+      }
+      if (user.id === currentAdminId) {
+        return false;
+      }
+      if (user.email.trim().toLowerCase() === currentAdminEmail) {
+        return false;
+      }
+      return !isBootstrapSuperAdminUser(user);
+    });
+  }, [profile?.email, profile?.id, superAdminUsersQuery.data?.items]);
+
   const tenantRelationsQuery = useQuery({
     queryKey: ["tenant-relations", targetTenantId],
     queryFn: () => fetchTenantRelations(targetTenantId),
@@ -139,42 +160,6 @@ export function TenantFineGrainedPermissionsPage() {
   });
   const tenantRelations = tenantRelationsQuery.data ?? [];
 
-  // 🌟 서버 데이터를 수신하면 로컬 변경 상태 맵을 실시간 동기화
-  useEffect(() => {
-    if (systemRelationsQuery.data) {
-      const initialMap: Record<
-        string,
-        Record<string, "none" | "read" | "write">
-      > = {};
-      for (const user of systemRelationsQuery.data) {
-        initialMap[user.userId] = {};
-        const menus = [
-          "overview",
-          "audit_logs",
-          "tenants",
-          "org_chart",
-          "users",
-          "worksmobile",
-          "api_keys",
-          "ory_ssot",
-          "data_integrity",
-          "auth_guard",
-          "permissions_direct",
-        ];
-        for (const m of menus) {
-          const isWrite = user.relations.includes(`${m}_managers`);
-          const isRead = user.relations.includes(`${m}_viewers`);
-          initialMap[user.userId][m] = isWrite
-            ? "write"
-            : isRead
-              ? "read"
-              : "none";
-        }
-      }
-      setLocalSystemPermissions(initialMap);
-    }
-  }, [systemRelationsQuery.data]);
-
   const addSystemRelationMutation = useMutation({
     mutationFn: (payload: { userId: string; relation: string }) =>
       addSystemRelation(payload.userId, payload.relation),
@@ -325,14 +310,19 @@ export function TenantFineGrainedPermissionsPage() {
   const updateUserRoleMutation = useMutation({
     mutationFn: (payload: { userIds: string[]; role: string }) =>
       bulkUpdateUsers(payload),
-    onSuccess: () => {
+    onSuccess: (_data, variables) => {
       queryClient.invalidateQueries({ queryKey: ["admin-users"] });
       queryClient.invalidateQueries({ queryKey: ["me"] });
       toast.success(
-        t(
-          "msg.admin.permissions_direct.super_admin_grant_success",
-          "Super Admin 역할이 부여되었습니다.",
-        ),
+        variables.role === "super_admin"
+          ? t(
+              "msg.admin.permissions_direct.super_admin_grant_success",
+              "Super Admin 역할이 부여되었습니다.",
+            )
+          : t(
+              "msg.admin.permissions_direct.super_admin_revoke_success",
+              "Super Admin 역할을 회수했습니다.",
+            ),
       );
       setSelectedSuperAdminUserIds([]);
     },
@@ -344,70 +334,6 @@ export function TenantFineGrainedPermissionsPage() {
     },
   });
 
-  const handleSystemRelationChange = async (
-    userId: string,
-    menuKey: string,
-    currentVal: "none" | "read" | "write",
-    newVal: "none" | "read" | "write",
-  ) => {
-    if (currentVal === newVal) return;
-
-    try {
-      if (currentVal === "read") {
-        await removeSystemRelationMutation.mutateAsync({
-          userId,
-          relation: `${menuKey}_viewers`,
-        });
-      } else if (currentVal === "write") {
-        await removeSystemRelationMutation.mutateAsync({
-          userId,
-          relation: `${menuKey}_managers`,
-        });
-      }
-
-      if (newVal === "read") {
-        await addSystemRelationMutation.mutateAsync({
-          userId,
-          relation: `${menuKey}_viewers`,
-        });
-      } else if (newVal === "write") {
-        await addSystemRelationMutation.mutateAsync({
-          userId,
-          relation: `${menuKey}_managers`,
-        });
-      }
-
-      // 🌟 Trigger a single consolidated success toast at the very end
-      toast.success(
-        t(
-          "msg.admin.system.relations.update_success",
-          "시스템 메뉴 권한이 성공적으로 변경되었습니다.",
-        ),
-      );
-    } catch {
-      // Individual mutations handle error toast via onError
-    }
-  };
-
-  const handleRemoveAllSystemRelations = async (
-    userId: string,
-    userRelations: string[],
-  ) => {
-    if (
-      !window.confirm(
-        t(
-          "msg.admin.system.relations.remove_all_confirm",
-          "이 사용자의 모든 시스템 메뉴 권한을 삭제하시겠습니까?",
-        ),
-      )
-    ) {
-      return;
-    }
-    for (const rel of userRelations) {
-      await removeSystemRelationMutation.mutateAsync({ userId, relation: rel });
-    }
-  };
-
   const toggleSuperAdminUser = (userId: string, checked: boolean) => {
     setSelectedSuperAdminUserIds((current) =>
       checked
@@ -435,7 +361,10 @@ export function TenantFineGrainedPermissionsPage() {
     }
 
     const relation = resolveBulkRelation();
-    if (bulkRelationMode === "page" && relation.startsWith("permissions_direct_")) {
+    if (
+      bulkRelationMode === "page" &&
+      relation.startsWith("permissions_direct_")
+    ) {
       toast.error(
         t(
           "msg.admin.permissions_direct.protected_relation",
@@ -489,19 +418,19 @@ export function TenantFineGrainedPermissionsPage() {
     setQueuedTargetUsers([]);
   };
 
-  const handleGrantSuperAdminRole = () => {
+  const handleRevokeSuperAdminRole = () => {
     if (selectedSuperAdminUserIds.length === 0) {
       toast.error(
         t(
           "msg.admin.permissions_direct.super_admin_users_required",
-          "Super Admin을 부여할 사용자를 하나 이상 선택하세요.",
+          "회수할 Super Admin 사용자를 하나 이상 선택하세요.",
         ),
       );
       return;
     }
     updateUserRoleMutation.mutate({
       userIds: selectedSuperAdminUserIds,
-      role: "super_admin",
+      role: "user",
     });
   };
 
@@ -537,18 +466,18 @@ export function TenantFineGrainedPermissionsPage() {
           name: selection.name,
           email: selection.email,
           tenantSlug: selection.leafTenantName,
-	          tenant: selection.leafTenantName
-	            ? {
-	                id: "",
-	                type: "ORGANIZATION",
-	                slug: "",
-	                name: selection.leafTenantName,
-	                description: "",
-	                status: "active",
-	                memberCount: 0,
-	                createdAt: "",
-	                updatedAt: "",
-	              }
+          tenant: selection.leafTenantName
+            ? {
+                id: "",
+                type: "ORGANIZATION",
+                slug: "",
+                name: selection.leafTenantName,
+                description: "",
+                status: "active",
+                memberCount: 0,
+                createdAt: "",
+                updatedAt: "",
+              }
             : undefined,
           metadata: {
             rootTenantName: selection.rootTenantName,
@@ -698,8 +627,6 @@ export function TenantFineGrainedPermissionsPage() {
     },
   ];
 
-  const filteredRelations = systemRelations;
-  const selectedUser = undefined;
   const grantableSystemMenus = systemMenuCategories.flatMap((category) =>
     category.menus.filter(
       (menu) => !protectedSystemMenuRelations.has(menu.relation),
@@ -975,7 +902,19 @@ export function TenantFineGrainedPermissionsPage() {
                     {t("ui.admin.permissions_direct.bulk_selected", "명 선택")}
                   </Badge>
                 </div>
-                <div className="grid gap-3 lg:grid-cols-[minmax(0,0.8fr)_minmax(320px,1.2fr)]">
+                <div className="grid gap-3 lg:grid-cols-[minmax(320px,1.2fr)_minmax(0,0.8fr)]">
+                  <div className="min-h-[300px] overflow-hidden rounded-md border bg-background">
+                    <iframe
+                      title={t(
+                        "ui.admin.permissions_direct.target_org_picker",
+                        "조직도에서 사용자 선택",
+                      )}
+                      src={orgChartMemberPickerUrl}
+                      className="h-[340px] w-full"
+                      data-testid="permission-target-org-picker-frame"
+                    />
+                  </div>
+
                   <div className="space-y-3">
                     <div
                       className="min-h-16 rounded-md border bg-background p-2"
@@ -989,66 +928,53 @@ export function TenantFineGrainedPermissionsPage() {
                           )}
                         </div>
                       ) : (
-	                        <div className="flex flex-wrap gap-2">
-	                          {queuedTargetUsers.map((user) => {
-	                            const rootTenantName =
-	                              typeof user.metadata?.rootTenantName === "string"
-	                                ? user.metadata.rootTenantName
-	                                : "";
-	                            const leafTenantName =
-	                              typeof user.metadata?.leafTenantName === "string"
-	                                ? user.metadata.leafTenantName
-	                                : "";
-	                            const tenantPath = [
-	                              rootTenantName,
-	                              leafTenantName,
-	                            ]
-	                              .filter(Boolean)
-	                              .join(" / ");
+                        <div className="flex flex-wrap gap-2">
+                          {queuedTargetUsers.map((user) => {
+                            const rootTenantName =
+                              typeof user.metadata?.rootTenantName === "string"
+                                ? user.metadata.rootTenantName
+                                : "";
+                            const leafTenantName =
+                              typeof user.metadata?.leafTenantName === "string"
+                                ? user.metadata.leafTenantName
+                                : "";
+                            const tenantPath = [rootTenantName, leafTenantName]
+                              .filter(Boolean)
+                              .join(" / ");
 
-	                            return (
-	                              <span
-	                                key={user.id}
-	                                className="inline-flex max-w-full items-center gap-2 rounded-md border bg-muted/30 px-2 py-1 text-sm"
-	                              >
-	                                <span className="max-w-52 truncate">
-	                                  {user.name}
-	                                </span>
-	                                {tenantPath !== "" && (
-	                                  <span className="max-w-64 truncate text-xs text-muted-foreground">
-	                                    {tenantPath}
-	                                  </span>
-	                                )}
-	                                <button
-	                                  type="button"
-	                                  className="text-muted-foreground hover:text-foreground"
-	                                  onClick={() => removeQueuedTargetUser(user.id)}
-	                                  aria-label={t(
-	                                    "ui.admin.permissions_direct.target_queue_remove",
-	                                    "적용 대상에서 제거",
-	                                  )}
-	                                >
-	                                  <X size={14} />
-	                                </button>
-	                              </span>
-	                            );
-	                          })}
-	                        </div>
+                            return (
+                              <span
+                                key={user.id}
+                                className="inline-flex max-w-full items-center gap-2 rounded-md border bg-muted/30 px-2 py-1 text-sm"
+                              >
+                                <span className="max-w-52 truncate">
+                                  {user.name}
+                                </span>
+                                {tenantPath !== "" && (
+                                  <span className="max-w-64 truncate text-xs text-muted-foreground">
+                                    {tenantPath}
+                                  </span>
+                                )}
+                                <button
+                                  type="button"
+                                  className="text-muted-foreground hover:text-foreground"
+                                  onClick={() =>
+                                    removeQueuedTargetUser(user.id)
+                                  }
+                                  aria-label={t(
+                                    "ui.admin.permissions_direct.target_queue_remove",
+                                    "적용 대상에서 제거",
+                                  )}
+                                >
+                                  <X size={14} />
+                                </button>
+                              </span>
+                            );
+                          })}
+                        </div>
                       )}
                     </div>
                   </div>
-
-                  <div className="min-h-[300px] overflow-hidden rounded-md border bg-background">
-                    <iframe
-                      title={t(
-                        "ui.admin.permissions_direct.target_org_picker",
-                        "조직도에서 사용자 선택",
-                      )}
-                      src={orgChartMemberPickerUrl}
-                      className="h-[340px] w-full"
-                      data-testid="permission-target-org-picker-frame"
-                    />
-                  </div>
                 </div>
               </div>
 
@@ -1056,6 +982,7 @@ export function TenantFineGrainedPermissionsPage() {
                 <label className="space-y-2 text-sm font-medium">
                   {t("ui.admin.permissions_direct.bulk_mode", "권한 방식")}
                   <select
+                    name="bulk-relation-mode"
                     data-testid="bulk-relation-mode"
                     value={bulkRelationMode}
                     onChange={(event) =>
@@ -1087,6 +1014,7 @@ export function TenantFineGrainedPermissionsPage() {
                       "페이지 접근 권한",
                     )}
                     <select
+                      name="bulk-page-relation"
                       data-testid="bulk-page-relation"
                       value={bulkPageRelation}
                       onChange={(event) =>
@@ -1106,12 +1034,16 @@ export function TenantFineGrainedPermissionsPage() {
                     <div className="space-y-2 text-sm font-medium">
                       {t("ui.admin.permissions_direct.bulk_target", "대상")}
                       <input
+                        name="bulk-relation-target-tenant"
                         data-testid="bulk-relation-target-tenant"
                         type="hidden"
                         value={targetTenantId}
                         readOnly
                       />
-                      <Dialog open={tenantPickerOpen} onOpenChange={setTenantPickerOpen}>
+                      <Dialog
+                        open={tenantPickerOpen}
+                        onOpenChange={setTenantPickerOpen}
+                      >
                         <Button
                           type="button"
                           variant="outline"
@@ -1159,7 +1091,10 @@ export function TenantFineGrainedPermissionsPage() {
                             <div className="max-h-80 overflow-y-auto rounded-md border">
                               {tenantPickerCandidates.length === 0 ? (
                                 <div className="px-3 py-8 text-center text-sm text-muted-foreground">
-                                  {t("ui.common.no_results", "검색 결과가 없습니다.")}
+                                  {t(
+                                    "ui.common.no_results",
+                                    "검색 결과가 없습니다.",
+                                  )}
                                 </div>
                               ) : (
                                 tenantPickerCandidates.map((tenant) => (
@@ -1194,6 +1129,7 @@ export function TenantFineGrainedPermissionsPage() {
                         "페이지",
                       )}
                       <select
+                        name="bulk-relation-target"
                         data-testid="bulk-relation-target"
                         value={bulkTenantPage}
                         onChange={(event) =>
@@ -1211,6 +1147,7 @@ export function TenantFineGrainedPermissionsPage() {
                     <label className="space-y-2 text-sm font-medium">
                       {t("ui.admin.permissions_direct.bulk_action", "액션")}
                       <select
+                        name="bulk-relation-action"
                         data-testid="bulk-relation-action"
                         value={bulkAction}
                         onChange={(event) =>
@@ -1281,6 +1218,7 @@ export function TenantFineGrainedPermissionsPage() {
                   />
                 </div>
                 <select
+                  name="permission-assignment-sort"
                   data-testid="permission-assignment-sort"
                   value={assignmentSort}
                   onChange={(event) =>
@@ -1314,7 +1252,10 @@ export function TenantFineGrainedPermissionsPage() {
                       {t("ui.admin.permissions_direct.table_target", "대상")}
                     </TableHead>
                     <TableHead>
-                      {t("ui.admin.permissions_direct.table_relation", "Relation")}
+                      {t(
+                        "ui.admin.permissions_direct.table_relation",
+                        "Relation",
+                      )}
                     </TableHead>
                     <TableHead className="w-[180px]">
                       {t("ui.admin.permissions_direct.table_level", "권한")}
@@ -1376,6 +1317,7 @@ export function TenantFineGrainedPermissionsPage() {
                         </TableCell>
                         <TableCell>
                           <select
+                            name={`permission-assignment-level-${row.user.userId}-${row.relation}`}
                             data-testid={`permission-assignment-level-${row.user.userId}-${row.relation}`}
                             value={row.level}
                             disabled={row.protected}
@@ -1427,7 +1369,6 @@ export function TenantFineGrainedPermissionsPage() {
               </Table>
             </div>
           </div>
-
         </>
       )}
 
@@ -1437,13 +1378,13 @@ export function TenantFineGrainedPermissionsPage() {
             <h2 className="text-lg font-bold">
               {t(
                 "ui.admin.permissions_direct.super_admin_title",
-                "Super Admin 역할 부여",
+                "Super Admin 역할 회수",
               )}
             </h2>
             <p className="text-sm text-muted-foreground">
               {t(
                 "msg.admin.permissions_direct.super_admin_description",
-                "전역 시스템 관리자 역할은 상세 relation과 분리해서 부여합니다.",
+                "현재 로그인한 관리자와 최초 관리자를 제외한 Super Admin 역할을 회수합니다.",
               )}
             </p>
           </div>
@@ -1451,7 +1392,10 @@ export function TenantFineGrainedPermissionsPage() {
           <div className="mt-5 rounded-lg border border-border/70 bg-muted/10 p-4">
             <div className="mb-3 flex items-center justify-between gap-3">
               <h3 className="text-sm font-semibold">
-                {t("ui.admin.permissions_direct.super_admin_users", "대상 사용자")}
+                {t(
+                  "ui.admin.permissions_direct.super_admin_users",
+                  "대상 사용자",
+                )}
               </h3>
               <Badge variant="secondary">
                 {selectedSuperAdminUserIds.length}
@@ -1459,7 +1403,11 @@ export function TenantFineGrainedPermissionsPage() {
               </Badge>
             </div>
             <div className="max-h-80 space-y-1 overflow-y-auto pr-1">
-              {systemRelations.length === 0 ? (
+              {superAdminUsersQuery.isFetching ? (
+                <div className="py-8 text-center text-xs text-muted-foreground">
+                  {t("msg.common.loading", "불러오는 중입니다.")}
+                </div>
+              ) : revocableSuperAdminUsers.length === 0 ? (
                 <div className="py-8 text-center text-xs text-muted-foreground">
                   {t(
                     "msg.admin.permissions_direct.no_users_found",
@@ -1467,17 +1415,18 @@ export function TenantFineGrainedPermissionsPage() {
                   )}
                 </div>
               ) : (
-                systemRelations.map((user) => (
+                revocableSuperAdminUsers.map((user) => (
                   <label
-                    key={user.userId}
+                    key={user.id}
                     className="flex items-center gap-3 rounded-md px-2 py-2 text-sm hover:bg-muted/40"
                   >
                     <input
+                      name={`super-admin-role-user-${user.id}`}
                       type="checkbox"
-                      data-testid={`super-admin-role-user-${user.userId}`}
-                      checked={selectedSuperAdminUserIds.includes(user.userId)}
+                      data-testid={`super-admin-role-user-${user.id}`}
+                      checked={selectedSuperAdminUserIds.includes(user.id)}
                       onChange={(event) =>
-                        toggleSuperAdminUser(user.userId, event.target.checked)
+                        toggleSuperAdminUser(user.id, event.target.checked)
                       }
                     />
                     <span className="min-w-0 flex-1">
@@ -1496,18 +1445,20 @@ export function TenantFineGrainedPermissionsPage() {
 
           <div className="mt-5 flex justify-end">
             <Button
-              onClick={handleGrantSuperAdminRole}
-              disabled={updateUserRoleMutation.isPending}
+              onClick={handleRevokeSuperAdminRole}
+              disabled={
+                updateUserRoleMutation.isPending ||
+                selectedSuperAdminUserIds.length === 0
+              }
             >
               {t(
-                "ui.admin.permissions_direct.super_admin_grant",
-                "Super Admin 부여",
+                "ui.admin.permissions_direct.super_admin_revoke",
+                "Super Admin 회수",
               )}
             </Button>
           </div>
         </div>
       )}
-
     </div>
   );
 }
diff --git a/adminfront/src/features/tenants/routes/TenantListPage.tsx b/adminfront/src/features/tenants/routes/TenantListPage.tsx
index 8f7819e0..554ef6bf 100644
--- a/adminfront/src/features/tenants/routes/TenantListPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantListPage.tsx
@@ -505,9 +505,7 @@ function TenantListPage() {
       tenantIds: selectedIds,
       ...(selectedBulkStatus ? { status: selectedBulkStatus } : {}),
       ...(selectedBulkType ? { type: selectedBulkType } : {}),
-      ...(selectedBulkVisibility
-        ? { visibility: selectedBulkVisibility }
-        : {}),
+      ...(selectedBulkVisibility ? { visibility: selectedBulkVisibility } : {}),
     });
   };
 
@@ -1129,7 +1127,10 @@ function TenantListPage() {
                 </SelectItem>
               </SelectContent>
             </Select>
-            <Select value={selectedBulkType} onValueChange={setSelectedBulkType}>
+            <Select
+              value={selectedBulkType}
+              onValueChange={setSelectedBulkType}
+            >
               <SelectTrigger
                 className="h-8 w-[180px] bg-transparent border-background/20 text-background text-xs"
                 data-testid="tenant-bulk-type-select"
diff --git a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
index 46c939b9..050ba557 100644
--- a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
+++ b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
@@ -665,9 +665,7 @@ describe("TenantWorksmobilePage comparison helpers", () => {
           },
         ],
       }),
-    ).toEqual([
-      "직급: 없음 -> 책임연구원 (Baron HmEG / WORKS WORKS HmEG)",
-    ]);
+    ).toEqual(["직급: 없음 -> 책임연구원 (Baron HmEG / WORKS WORKS HmEG)"]);
   });
 
   it("does not format phone update details for spaced Korean country code formatting only", () => {
diff --git a/adminfront/src/features/tenants/routes/worksmobileComparison.ts b/adminfront/src/features/tenants/routes/worksmobileComparison.ts
index d0c15d0b..02aab717 100644
--- a/adminfront/src/features/tenants/routes/worksmobileComparison.ts
+++ b/adminfront/src/features/tenants/routes/worksmobileComparison.ts
@@ -383,7 +383,7 @@ export function formatWorksmobileUserMembershipDetails(
       `Baron ${baronOrg}`,
       `WORKS ${worksOrg}`,
       membership.worksmobileLevelName?.trim() ||
-        membership.worksmobileLevelId?.trim()
+      membership.worksmobileLevelId?.trim()
         ? `직급 ${membership.worksmobileLevelName?.trim() || membership.worksmobileLevelId?.trim()}`
         : "",
     ].filter(Boolean);
diff --git a/adminfront/src/features/users/UserListPage.tsx b/adminfront/src/features/users/UserListPage.tsx
index 6bef5c43..a3d3028c 100644
--- a/adminfront/src/features/users/UserListPage.tsx
+++ b/adminfront/src/features/users/UserListPage.tsx
@@ -353,6 +353,9 @@ function UserListPage() {
   const [selectedBulkStatus, setSelectedBulkStatus] = React.useState<
     UserStatusValue | ""
   >("");
+  const [selectedBulkRole, setSelectedBulkRole] = React.useState<
+    "super_admin" | "user" | ""
+  >("");
   const [sortConfig, setSortConfig] =
     React.useState<SortConfig<UserSortKey> | null>(null);
   const [bulkUploadOpen, setBulkUploadOpen] = React.useState(false);
@@ -652,6 +655,7 @@ function UserListPage() {
       query.refetch();
       setSelectedUserIds([]);
       setSelectedBulkStatus("");
+      setSelectedBulkRole("");
       toast.success(
         t(
           "msg.admin.users.bulk.update_success",
@@ -1241,24 +1245,60 @@ function UserListPage() {
                     const payload: {
                       userIds: string[];
                       status?: UserStatusValue;
+                      role?: "super_admin" | "user";
                     } = { userIds: selectedUserIds };
                     let hasChanges = false;
                     if (selectedBulkStatus) {
                       payload.status = selectedBulkStatus;
                       hasChanges = true;
                     }
+                    if (selectedBulkRole) {
+                      payload.role = selectedBulkRole;
+                      hasChanges = true;
+                    }
                     if (hasChanges) {
                       bulkUpdateMutation.mutate(payload);
                     }
                   }}
                   disabled={
-                    !selectedBulkStatus || bulkUpdateMutation.isPending || !isWritable
+                    (!selectedBulkStatus && !selectedBulkRole) ||
+                    bulkUpdateMutation.isPending ||
+                    !isWritable
                   }
                   data-testid="bulk-apply-btn"
                 >
                   <ShieldCheck size={14} />
                   {t("ui.common.apply", "적용")}
                 </Button>
+                <Select
+                  value={selectedBulkRole}
+                  onValueChange={(value) =>
+                    setSelectedBulkRole(value as "super_admin" | "user")
+                  }
+                >
+                  <SelectTrigger
+                    className="h-8 w-[150px] bg-transparent border-background/20 text-background text-xs"
+                    data-testid="bulk-permission-select"
+                  >
+                    <SelectValue
+                      placeholder={t(
+                        "ui.admin.users.bulk.permission_placeholder",
+                        "권한 선택",
+                      )}
+                    />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="super_admin">
+                      {t(
+                        "ui.admin.users.detail.form.role_super_admin",
+                        "시스템 관리자",
+                      )}
+                    </SelectItem>
+                    <SelectItem value="user">
+                      {t("ui.admin.users.detail.form.role_user", "일반 사용자")}
+                    </SelectItem>
+                  </SelectContent>
+                </Select>
                 <div className="w-px h-4 bg-background/20 mx-1" />
                 <Button
                   variant="ghost"
diff --git a/adminfront/src/features/users/orgChartPicker.ts b/adminfront/src/features/users/orgChartPicker.ts
index ea754e25..204eae37 100644
--- a/adminfront/src/features/users/orgChartPicker.ts
+++ b/adminfront/src/features/users/orgChartPicker.ts
@@ -507,6 +507,8 @@ export function buildOrgChartUserMultiPickerUrl(
   params.set("showDescendantToggle", "true");
   if (options.tenantId?.trim()) {
     params.set("tenantId", options.tenantId.trim());
+  } else {
+    params.set("rootTenantId", "all");
   }
 
   return `${normalizedBase}/embed/picker?${params.toString()}`;
diff --git a/adminfront/src/locales/en.toml b/adminfront/src/locales/en.toml
index 184a1d92..a35e78ed 100644
--- a/adminfront/src/locales/en.toml
+++ b/adminfront/src/locales/en.toml
@@ -2010,12 +2010,14 @@ select_tenant_desc = "Select target tenant to assign fine-grained permissions."
 placeholder = "-- Select Tenant --"
 add_system_user = "Add User to Admin Control"
 dialog_title_system = "Add User to Global Permissions"
+super_admin_revoke = "Revoke super administrator"
 
 [msg.admin.permissions_direct]
 description = "Directly assign and manage tab-level direct permissions and global sidebar menu access."
 tab_system_desc = "Directly grant users access to each sidebar menu page. Super admins always bypass and pass all access checks."
 system_empty = "No users with custom global menu permissions found. Add users to start managing."
 select_prompt = "Select a tenant from the dropdown above to manage its fine-grained features."
+super_admin_revoke_success = "Super administrator access revoked."
 
 [msg.admin.system.relations]
 add_success = "Global menu permission added successfully."
diff --git a/adminfront/src/locales/ko.toml b/adminfront/src/locales/ko.toml
index db71bb91..4b2bda4e 100644
--- a/adminfront/src/locales/ko.toml
+++ b/adminfront/src/locales/ko.toml
@@ -2010,12 +2010,14 @@ select_tenant_desc = "세부 기능 권한을 부여할 대상 테넌트를 리
 placeholder = "-- 테넌트 선택 --"
 add_system_user = "시스템 권한 사용자 추가"
 dialog_title_system = "시스템 권한 관리 유저 추가"
+super_admin_revoke = "Super Admin 회수"
 
 [msg.admin.permissions_direct]
 description = "테넌트의 세부 기능 권한 및 글로벌 사이드바 메뉴 탭 접근 권한을 지정하고 부여합니다."
 tab_system_desc = "사이드바 각 메뉴별 접근 권한을 사용자에게 직접 부여합니다. 최고 관리자(super_admin)는 기본적으로 언제나 모든 권한을 우회 통과합니다."
 system_empty = "지정된 글로벌 메뉴 세부 권한자가 없습니다. 사용자를 추가해 관리해 주세요."
 select_prompt = "상단에서 테넌트를 선택하면 세부 권한 격리 설정 격자가 노출됩니다."
+super_admin_revoke_success = "Super Admin 권한을 회수했습니다."
 
 [msg.admin.system.relations]
 add_success = "시스템 메뉴 권한이 추가되었습니다."
diff --git a/adminfront/src/locales/template.toml b/adminfront/src/locales/template.toml
index 2873968d..0f404183 100644
--- a/adminfront/src/locales/template.toml
+++ b/adminfront/src/locales/template.toml
@@ -1964,12 +1964,14 @@ select_tenant_desc = ""
 placeholder = ""
 add_system_user = ""
 dialog_title_system = ""
+super_admin_revoke = ""
 
 [msg.admin.permissions_direct]
 description = ""
 tab_system_desc = ""
 system_empty = ""
 select_prompt = ""
+super_admin_revoke_success = ""
 
 [msg.admin.system.relations]
 add_success = ""
diff --git a/adminfront/tests/tenant-performance.spec.ts b/adminfront/tests/tenant-performance.spec.ts
index 72c6c0f3..07cc46ea 100644
--- a/adminfront/tests/tenant-performance.spec.ts
+++ b/adminfront/tests/tenant-performance.spec.ts
@@ -189,9 +189,9 @@ test.describe("Tenant list performance", () => {
 
     const loadStarted = performance.now();
     await page.goto("/tenants");
-    await expect(page.getByTestId("tenant-internal-id-tenant-3500")).toBeVisible(
-      { timeout: 15000 },
-    );
+    await expect(
+      page.getByTestId("tenant-internal-id-tenant-3500"),
+    ).toBeVisible({ timeout: 15000 });
     const loadMs = performance.now() - loadStarted;
     const loadSnapshot = testInfo.outputPath("tenant-list-load.png");
     await page.screenshot({ path: loadSnapshot, fullPage: true });
@@ -201,9 +201,9 @@ test.describe("Tenant list performance", () => {
     const searchInput = page.getByPlaceholder("이름 또는 슬러그, ID 검색");
     const searchStarted = performance.now();
     await searchInput.fill("full-dataset-needle-0100");
-    await expect(page.getByTestId("tenant-internal-id-tenant-0100")).toBeVisible(
-      { timeout: 15000 },
-    );
+    await expect(
+      page.getByTestId("tenant-internal-id-tenant-0100"),
+    ).toBeVisible({ timeout: 15000 });
     const searchMs = performance.now() - searchStarted;
     const searchSnapshot = testInfo.outputPath("tenant-list-search.png");
     await page.screenshot({ path: searchSnapshot, fullPage: true });
@@ -211,9 +211,9 @@ test.describe("Tenant list performance", () => {
     await expect(page.locator("tbody")).toContainText(
       "full-dataset-needle-0100",
     );
-    await expect(page.getByTestId("tenant-internal-id-tenant-3500")).toHaveCount(
-      0,
-    );
+    await expect(
+      page.getByTestId("tenant-internal-id-tenant-3500"),
+    ).toHaveCount(0);
 
     console.log(
       JSON.stringify({
@@ -225,8 +225,9 @@ test.describe("Tenant list performance", () => {
       }),
     );
 
+    const searchBudgetMs = testInfo.project.name === "firefox" ? 1000 : 500;
     expect(loadMs).toBeLessThanOrEqual(1500);
-    expect(searchMs).toBeLessThanOrEqual(500);
+    expect(searchMs).toBeLessThanOrEqual(searchBudgetMs);
   });
 });
 
diff --git a/adminfront/tests/tenant-profile-performance-local.spec.ts b/adminfront/tests/tenant-profile-performance-local.spec.ts
index 5096aede..7c1e65ab 100644
--- a/adminfront/tests/tenant-profile-performance-local.spec.ts
+++ b/adminfront/tests/tenant-profile-performance-local.spec.ts
@@ -214,6 +214,10 @@ test.describe("Tenant profile local performance evidence", () => {
 
     console.log(JSON.stringify(evidence, null, 2));
 
-    expect(evidence.summary.configFieldsVisibleMs.p95).toBeLessThanOrEqual(500);
+    const configVisibleBudgetMs =
+      testInfo.project.name === "firefox" ? 1200 : 500;
+    expect(evidence.summary.configFieldsVisibleMs.p95).toBeLessThanOrEqual(
+      configVisibleBudgetMs,
+    );
   });
 });
diff --git a/adminfront/tests/users.spec.ts b/adminfront/tests/users.spec.ts
index c763dbe4..688c7c79 100644
--- a/adminfront/tests/users.spec.ts
+++ b/adminfront/tests/users.spec.ts
@@ -789,8 +789,7 @@ test.describe("User Management", () => {
       .poll(() => updatePayload)
       .toMatchObject({ status: "preboarding" });
 
-    await table.locator('input[name="user-list-select-u-1"]').check();
-    await expect(page.getByTestId("bulk-permission-select")).toHaveCount(0);
+    await expect(page.getByTestId("user-role-select-u-1")).toHaveCount(0);
   });
 
   test("should keep system role assignment out of the permissions screen", async ({
@@ -907,23 +906,24 @@ test.describe("User Management", () => {
     await expect(
       page.getByRole("option", { name: /권한 부여.*수정/ }),
     ).toHaveCount(0);
-    await expect(page.getByTestId("permission-target-org-picker-frame")).toBeVisible();
-    await expect(page.getByTestId("permission-target-org-picker-frame")).toHaveAttribute(
-      "src",
-      /rootTenantId%3Dall|rootTenantId=all/,
-    );
+    await expect(
+      page.getByTestId("permission-target-org-picker-frame"),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId("permission-target-org-picker-frame"),
+    ).toHaveAttribute("src", /rootTenantId%3Dall|rootTenantId=all/);
     const pickerBox = await page
       .getByTestId("permission-target-org-picker-frame")
       .boundingBox();
-    const queueBox = await page.getByTestId("permission-target-queue").boundingBox();
+    const queueBox = await page
+      .getByTestId("permission-target-queue")
+      .boundingBox();
     expect(pickerBox?.x ?? Number.POSITIVE_INFINITY).toBeLessThan(
       queueBox?.x ?? Number.NEGATIVE_INFINITY,
     );
 
     await page.getByTestId("bulk-relation-mode").selectOption("target-action");
-    await expect(
-      page.getByTestId("bulk-relation-operation"),
-    ).toHaveCount(0);
+    await expect(page.getByTestId("bulk-relation-operation")).toHaveCount(0);
     await page.getByTestId("permission-action-tenant-picker-open").click();
     await page.getByTestId("permission-action-tenant-search").fill("Test");
     await page.getByTestId("permission-action-tenant-result-t-1").click();
@@ -980,40 +980,48 @@ test.describe("User Management", () => {
       .getByRole("button", { name: /선택 사용자에게 권한 부여/ })
       .click();
 
-    await expect.poll(() => relationWrites).toContainEqual(
-      { userId: "u-2", relation: "tenants_managers" },
-    );
-    await expect.poll(() => relationWrites).toContainEqual(
-      { userId: "u-2", relation: "profile_managers" },
-    );
-    await expect.poll(() => relationWrites).toContainEqual(
-      { userId: "u-3", relation: "profile_managers" },
-    );
+    await expect
+      .poll(() => relationWrites)
+      .toContainEqual({ userId: "u-2", relation: "tenants_managers" });
+    await expect
+      .poll(() => relationWrites)
+      .toContainEqual({ userId: "u-2", relation: "profile_managers" });
+    await expect
+      .poll(() => relationWrites)
+      .toContainEqual({ userId: "u-3", relation: "profile_managers" });
 
     await page.getByTestId("permission-assignment-search").fill("John");
-    await expect(page.getByTestId("permission-assignment-row-u-1-profile_viewers")).toBeVisible();
+    await expect(
+      page.getByTestId("permission-assignment-row-u-1-profile_viewers"),
+    ).toBeVisible();
     await expect(
       page.getByTestId("permission-assignment-row-u-2-profile_managers"),
     ).toHaveCount(0);
     await page.getByTestId("permission-assignment-search").fill("");
-    await page.getByTestId("permission-assignment-sort").selectOption("relation");
+    await page
+      .getByTestId("permission-assignment-sort")
+      .selectOption("relation");
     await page
       .getByTestId("permission-assignment-level-u-1-profile_viewers")
       .selectOption("write");
-    await expect.poll(() => relationWrites).toContainEqual({
-      userId: "u-1",
-      relation: "profile_managers",
-    });
+    await expect
+      .poll(() => relationWrites)
+      .toContainEqual({
+        userId: "u-1",
+        relation: "profile_managers",
+      });
     await page
       .getByTestId("permission-assignment-remove-u-1-profile_viewers")
       .click();
-    await expect.poll(() => relationDeletes).toContainEqual({
-      userId: "u-1",
-      relation: "profile_viewers",
-    });
+    await expect
+      .poll(() => relationDeletes)
+      .toContainEqual({
+        userId: "u-1",
+        relation: "profile_viewers",
+      });
   });
 
-  test("should grant super admin role from the last tab only for super admins", async ({
+  test("should revoke super admin role from the last tab only for super admins", async ({
     page,
   }) => {
     let bulkPayload: Record<string, unknown> | undefined;
@@ -1036,6 +1044,30 @@ test.describe("User Management", () => {
       });
     });
 
+    await page.route(/\/admin\/users(\?.*)?$/, async (route) => {
+      if (route.request().method() !== "GET") {
+        return route.fallback();
+      }
+      return route.fulfill({
+        json: {
+          items: [
+            {
+              id: "u-1",
+              name: "John Doe",
+              email: "john@test.com",
+              phone: "010-1111-2222",
+              role: "super_admin",
+              status: "active",
+              createdAt: "2026-04-01T00:00:00Z",
+            },
+          ],
+          total: 1,
+          limit: 10000,
+          offset: 0,
+        },
+      });
+    });
+
     await page.route(/\/admin\/users\/bulk$/, async (route) => {
       if (route.request().method() !== "PUT") {
         return route.fallback();
@@ -1052,12 +1084,14 @@ test.describe("User Management", () => {
     await tabs.last().click();
 
     await page.getByTestId("super-admin-role-user-u-1").check();
-    await page.getByRole("button", { name: /Super Admin 부여/ }).click();
+    await page.getByRole("button", { name: /Super Admin 회수/ }).click();
 
-    await expect.poll(() => bulkPayload).toEqual({
-      userIds: ["u-1"],
-      role: "super_admin",
-    });
+    await expect
+      .poll(() => bulkPayload)
+      .toEqual({
+        userIds: ["u-1"],
+        role: "user",
+      });
   });
 
   test("should hide the super admin role tab from non super admins", async ({
@@ -1525,9 +1559,7 @@ test.describe("User Management", () => {
     await expect(
       page.getByRole("tab", { name: /외부 기업 회원/i }),
     ).toHaveCount(0);
-    await expect(
-      page.getByRole("tab", { name: /^Commercial$/i }),
-    ).toBeVisible();
+    await expect(page.getByRole("tab", { name: /^일반회사$/i })).toBeVisible();
     await expect(page.getByRole("tab", { name: /^공공기관$/i })).toBeVisible();
     await expect(page.getByRole("tab", { name: /^교육기관$/i })).toBeVisible();
     await expect(page.getByRole("tab", { name: /^개인$/i })).toBeVisible();
diff --git a/backend/internal/handler/user_handler.go b/backend/internal/handler/user_handler.go
index 6059f095..b93d03b5 100644
--- a/backend/internal/handler/user_handler.go
+++ b/backend/internal/handler/user_handler.go
@@ -3559,6 +3559,7 @@ func (h *UserHandler) mapIdentitySummary(ctx context.Context, identity service.K
 	}
 
 	summary.Tenant = tenantSummary
+	markBootstrapSuperAdminSummary(&summary)
 
 	return summary
 }
@@ -3587,7 +3588,7 @@ func (h *UserHandler) mapLocalUserSummary(ctx context.Context, user domain.User)
 		Grade:          tenantBoundGradeFromUser(user),
 		Position:       user.Position,
 		JobTitle:       user.JobTitle,
-		Metadata:       user.Metadata,
+		Metadata:       maps.Clone(user.Metadata),
 		Tenant:         user.Tenant,
 		CreatedAt:      formatTime(user.CreatedAt),
 		UpdatedAt:      formatTime(user.UpdatedAt),
@@ -3599,9 +3600,29 @@ func (h *UserHandler) mapLocalUserSummary(ctx context.Context, user domain.User)
 		}
 	}
 
+	markBootstrapSuperAdminSummary(&summary)
+
 	return summary
 }
 
+func markBootstrapSuperAdminSummary(summary *userSummary) {
+	if summary == nil || !isBootstrapSuperAdminEmail(summary.Email) {
+		return
+	}
+	if summary.Metadata == nil {
+		summary.Metadata = make(domain.JSONMap)
+	}
+	summary.Metadata["bootstrapSuperAdmin"] = true
+}
+
+func isBootstrapSuperAdminEmail(email string) bool {
+	adminEmail := strings.ToLower(strings.TrimSpace(os.Getenv("ADMIN_EMAIL")))
+	if adminEmail == "" {
+		return false
+	}
+	return strings.ToLower(strings.TrimSpace(email)) == adminEmail
+}
+
 func (h *UserHandler) normalizePhoneNumber(phone string) string {
 	return normalizePhoneNumber(phone)
 }
diff --git a/backend/internal/handler/user_handler_test.go b/backend/internal/handler/user_handler_test.go
index 26e1a3b2..f58d964e 100644
--- a/backend/internal/handler/user_handler_test.go
+++ b/backend/internal/handler/user_handler_test.go
@@ -1260,6 +1260,51 @@ func TestUserHandler_ListUsersUsesIdentityMirrorAndDoesNotUseUserRepo(t *testing
 	mockKratos.AssertNotCalled(t, "ListIdentities", mock.Anything)
 }
 
+func TestUserHandler_ListUsersMarksBootstrapSuperAdmin(t *testing.T) {
+	t.Setenv("ADMIN_EMAIL", "bootstrap@example.com")
+
+	app := fiber.New()
+	mockKratos := new(MockKratosAdmin)
+	createdAt := time.Date(2026, 6, 17, 12, 0, 0, 0, time.UTC)
+
+	h := &UserHandler{KratosAdmin: mockKratos}
+
+	app.Use(func(c *fiber.Ctx) error {
+		c.Locals("user_profile", &domain.UserProfileResponse{
+			Role: domain.RoleSuperAdmin,
+		})
+		return c.Next()
+	})
+	app.Get("/users", h.ListUsers)
+
+	mockKratos.On("ListIdentities", mock.Anything).Return([]service.KratosIdentity{
+		{
+			ID:        "bootstrap-admin",
+			State:     "active",
+			CreatedAt: createdAt,
+			UpdatedAt: createdAt,
+			Traits: map[string]any{
+				"email": "bootstrap@example.com",
+				"name":  "Bootstrap Admin",
+				"role":  domain.RoleSuperAdmin,
+			},
+		},
+	}, nil).Once()
+
+	req := httptest.NewRequest("GET", "/users?limit=10&offset=0", nil)
+	resp, err := app.Test(req)
+
+	require.NoError(t, err)
+	require.Equal(t, http.StatusOK, resp.StatusCode)
+
+	var res userListResponse
+	require.NoError(t, json.NewDecoder(resp.Body).Decode(&res))
+	require.Len(t, res.Items, 1)
+	require.Equal(t, "bootstrap-admin", res.Items[0].ID)
+	require.Equal(t, true, res.Items[0].Metadata["bootstrapSuperAdmin"])
+	mockKratos.AssertExpectations(t)
+}
+
 func TestUserHandler_ListUsersPassesQueryToIdentityMirrorPageInsteadOfLoadingFullMirror(t *testing.T) {
 	app := fiber.New()
 	createdAt := time.Date(2026, 6, 17, 8, 50, 0, 0, time.UTC)
diff --git a/devfront/src/locales/en.toml b/devfront/src/locales/en.toml
index 60ce8c2c..4911ef5c 100644
--- a/devfront/src/locales/en.toml
+++ b/devfront/src/locales/en.toml
@@ -1804,10 +1804,12 @@ actions = "Actions"
 application = "Application"
 client_id = "Client ID"
 created_at = "Created At"
+creator = "Creator"
 status = "Status"
 type = "Type"
 
 [ui.dev.clients.type]
+headless = "Headless Login"
 pkce = "PKCE"
 private = "Server side App"
 pkce_headless = "PKCE (Headless Login)"
diff --git a/devfront/src/locales/ko.toml b/devfront/src/locales/ko.toml
index d175aa63..53e30423 100644
--- a/devfront/src/locales/ko.toml
+++ b/devfront/src/locales/ko.toml
@@ -1803,10 +1803,12 @@ actions = "액션"
 application = "애플리케이션"
 client_id = "클라이언트 ID"
 created_at = "생성일"
+creator = "생성자"
 status = "상태"
 type = "유형"
 
 [ui.dev.clients.type]
+headless = "Headless Login"
 private = "Server side App"
 pkce = "PKCE"
 pkce_headless = "PKCE (Headless Login)"
diff --git a/devfront/src/locales/template.toml b/devfront/src/locales/template.toml
index 45f2d56f..9c479768 100644
--- a/devfront/src/locales/template.toml
+++ b/devfront/src/locales/template.toml
@@ -1854,10 +1854,12 @@ actions = ""
 application = ""
 client_id = ""
 created_at = ""
+creator = ""
 status = ""
 type = ""
 
 [ui.dev.clients.type]
+headless = ""
 pkce = ""
 private = ""
 pkce_headless = ""
diff --git a/locales/en.toml b/locales/en.toml
index cae2ac0c..9990de93 100644
--- a/locales/en.toml
+++ b/locales/en.toml
@@ -273,8 +273,20 @@ desc_tenants = "Desc Tenants"
 desc_users = "Desc Users"
 desc_worksmobile = "Desc Worksmobile"
 description = "Assign and grant fine-grained functional permissions for tenants and global sidebar menu tab access."
+assignment_empty = "No direct assignments found."
+assignment_table_desc = "Review and revoke direct permission assignments."
+bulk_description = "Grant a direct permission to selected users."
+bulk_grant_success = "Direct permission granted."
+bulk_users_required = "Select at least one user."
 no_user_selected_desc = "No User Selected Desc"
 no_users_found = "No Users Found"
+protected_relation = "This relation is protected and cannot be changed here."
+super_admin_description = "Grant or revoke system super administrator access."
+super_admin_grant_success = "Super administrator access granted."
+super_admin_revoke_success = "Super administrator access revoked."
+super_admin_users_required = "Select at least one user."
+target_tenant_picker_desc = "Choose the tenant scope for this permission."
+target_tenant_required = "Select a target tenant."
 
 [msg.admin.system]
 
@@ -1447,6 +1459,19 @@ total_users = "Total Users"
 
 [ui.admin.permissions_direct]
 allowed = "Allowed"
+assignment_search = "Search assignments"
+assignment_table_title = "Direct assignments"
+bulk_action = "Action"
+bulk_mode = "Mode"
+bulk_mode_page = "Page"
+bulk_mode_target_action = "Target action"
+bulk_page_relation = "Page permission"
+bulk_selected = "selected"
+bulk_submit_grant = "Grant permission"
+bulk_target = "Target"
+bulk_tenant_page = "Tenant page"
+bulk_title = "Bulk direct grant"
+bulk_users = "Users"
 cat_dashboard = "Cat Dashboard"
 cat_integrations = "Cat Integrations"
 cat_resources = "Cat Resources"
@@ -1454,7 +1479,28 @@ cat_system = "Cat System"
 dialog_title_system = "Dialog Title System"
 no_user_selected = "No User Selected"
 revoke_all = "Revoke All"
+scope_system = "System"
+scope_tenant = "Tenant"
+sort_level = "Sort by level"
+sort_relation = "Sort by relation"
+sort_user = "Sort by user"
+super_admin_grant = "Grant super administrator"
+super_admin_revoke = "Revoke super administrator"
 super_admin_only = "Super Admin Only"
+super_admin_title = "Super administrators"
+super_admin_users = "Super admin users"
+tab_direct = "Direct permissions"
+tab_super_admin = "Super administrators"
+table_level = "Level"
+table_relation = "Relation"
+table_target = "Target"
+table_user = "User"
+tabs = "Permission tabs"
+target_org_picker = "Select organization"
+target_queue_empty = "No targets selected"
+target_queue_remove = "Remove target"
+target_tenant_picker_title = "Select tenant"
+target_tenant_required_option = "Target tenant required"
 user_list = "User List"
 
 [ui.admin.profile]
@@ -1501,6 +1547,8 @@ section = "Tenants"
 [ui.admin.tenants.bulk]
 selected_count = "temp"
 status_placeholder = "temp"
+type_placeholder = "Change type"
+visibility_placeholder = "Change visibility"
 
 [ui.admin.tenants.create]
 title = "Tenant Add"
@@ -2575,13 +2623,16 @@ actions = "Actions"
 application = "Application"
 client_id = "Client ID"
 created_at = "Created At"
+creator = "Creator"
 status = "Status"
 type = "Type"
 
 [ui.dev.clients.type]
+headless = "Headless Login"
 pkce = "PKCE"
 pkce_headless = "Headless PKCE"
 private = "Server side App"
+private_headless = "Server side App (Headless Login)"
 
 [ui.dev.dashboard]
 ready_badge = "devfront ready"
diff --git a/locales/ko.toml b/locales/ko.toml
index 1158fd53..be4ba144 100644
--- a/locales/ko.toml
+++ b/locales/ko.toml
@@ -273,8 +273,20 @@ desc_tenants = "고객 테넌트 목록, 신규 부모-자식 테넌트 관리"
 desc_users = "가입 사용자 목록, 승인 및 커스텀 클레임 수동 주입"
 desc_worksmobile = "라인웍스 연동 및 사내 임직원 패스워드 강제 동기화"
 description = "테넌트의 세부 기능 권한 및 글로벌 사이드바 메뉴 탭 접근 권한을 지정하고 부여합니다."
+assignment_empty = "직접 부여된 권한이 없습니다."
+assignment_table_desc = "직접 부여 권한을 확인하고 회수합니다."
+bulk_description = "선택한 사용자에게 직접 권한을 부여합니다."
+bulk_grant_success = "직접 권한을 부여했습니다."
+bulk_users_required = "사용자를 한 명 이상 선택해 주세요."
 no_user_selected_desc = "왼쪽의 사용자 리스트에서 권한을 변경할 인원을 선택해 주세요."
 no_users_found = "등록된 사용자가 없습니다."
+protected_relation = "보호된 관계라 이 화면에서 변경할 수 없습니다."
+super_admin_description = "시스템 Super Admin 권한을 부여하거나 회수합니다."
+super_admin_grant_success = "Super Admin 권한을 부여했습니다."
+super_admin_revoke_success = "Super Admin 권한을 회수했습니다."
+super_admin_users_required = "사용자를 한 명 이상 선택해 주세요."
+target_tenant_picker_desc = "이 권한에 적용할 테넌트 범위를 선택합니다."
+target_tenant_required = "대상 테넌트를 선택해 주세요."
 
 [msg.admin.system]
 
@@ -1447,6 +1459,19 @@ total_users = "전체 사용자 수"
 
 [ui.admin.permissions_direct]
 allowed = "개 허용됨"
+assignment_search = "부여 내역 검색"
+assignment_table_title = "직접 부여 내역"
+bulk_action = "동작"
+bulk_mode = "모드"
+bulk_mode_page = "페이지"
+bulk_mode_target_action = "대상 동작"
+bulk_page_relation = "페이지 권한"
+bulk_selected = "선택됨"
+bulk_submit_grant = "권한 부여"
+bulk_target = "대상"
+bulk_tenant_page = "테넌트 페이지"
+bulk_title = "직접 권한 일괄 부여"
+bulk_users = "사용자"
 cat_dashboard = "핵심 대시보드 및 분석"
 cat_integrations = "인프라 연동 및 보안"
 cat_resources = "핵심 리소스 관리"
@@ -1454,7 +1479,28 @@ cat_system = "아이덴티티 및 게이트 관리"
 dialog_title_system = "시스템 권한 관리 유저 추가"
 no_user_selected = "사용자가 선택되지 않았습니다."
 revoke_all = "모든 권한 회수"
+scope_system = "시스템"
+scope_tenant = "테넌트"
+sort_level = "레벨순 정렬"
+sort_relation = "관계순 정렬"
+sort_user = "사용자순 정렬"
+super_admin_grant = "Super Admin 부여"
+super_admin_revoke = "Super Admin 회수"
 super_admin_only = "Super Admin 전용"
+super_admin_title = "Super Admin"
+super_admin_users = "Super Admin 사용자"
+tab_direct = "직접 권한"
+tab_super_admin = "Super Admin"
+table_level = "레벨"
+table_relation = "관계"
+table_target = "대상"
+table_user = "사용자"
+tabs = "권한 탭"
+target_org_picker = "조직 선택"
+target_queue_empty = "선택된 대상이 없습니다."
+target_queue_remove = "대상 제거"
+target_tenant_picker_title = "테넌트 선택"
+target_tenant_required_option = "대상 테넌트 필수"
 user_list = "대상 사용자"
 
 [ui.admin.profile]
@@ -1501,6 +1547,8 @@ section = "Tenants"
 [ui.admin.tenants.bulk]
 selected_count = "temp"
 status_placeholder = "temp"
+type_placeholder = "유형 변경"
+visibility_placeholder = "가시성 변경"
 
 [ui.admin.tenants.create]
 title = "테넌트 추가"
@@ -2575,13 +2623,16 @@ actions = "액션"
 application = "애플리케이션"
 client_id = "클라이언트 ID"
 created_at = "생성일"
+creator = "생성자"
 status = "상태"
 type = "유형"
 
 [ui.dev.clients.type]
+headless = "Headless Login"
 pkce = "PKCE"
 pkce_headless = "Headless PKCE"
 private = "Server side App"
+private_headless = "Server side App (Headless Login)"
 
 [ui.dev.dashboard]
 ready_badge = "devfront ready"
diff --git a/locales/template.toml b/locales/template.toml
index 6fd8d024..73c0cfe1 100644
--- a/locales/template.toml
+++ b/locales/template.toml
@@ -273,8 +273,20 @@ desc_tenants = ""
 desc_users = ""
 desc_worksmobile = ""
 description = ""
+assignment_empty = ""
+assignment_table_desc = ""
+bulk_description = ""
+bulk_grant_success = ""
+bulk_users_required = ""
 no_user_selected_desc = ""
 no_users_found = ""
+protected_relation = ""
+super_admin_description = ""
+super_admin_grant_success = ""
+super_admin_revoke_success = ""
+super_admin_users_required = ""
+target_tenant_picker_desc = ""
+target_tenant_required = ""
 
 [msg.admin.system]
 
@@ -1447,6 +1459,19 @@ total_users = ""
 
 [ui.admin.permissions_direct]
 allowed = ""
+assignment_search = ""
+assignment_table_title = ""
+bulk_action = ""
+bulk_mode = ""
+bulk_mode_page = ""
+bulk_mode_target_action = ""
+bulk_page_relation = ""
+bulk_selected = ""
+bulk_submit_grant = ""
+bulk_target = ""
+bulk_tenant_page = ""
+bulk_title = ""
+bulk_users = ""
 cat_dashboard = ""
 cat_integrations = ""
 cat_resources = ""
@@ -1454,7 +1479,28 @@ cat_system = ""
 dialog_title_system = ""
 no_user_selected = ""
 revoke_all = ""
+scope_system = ""
+scope_tenant = ""
+sort_level = ""
+sort_relation = ""
+sort_user = ""
+super_admin_grant = ""
+super_admin_revoke = ""
 super_admin_only = ""
+super_admin_title = ""
+super_admin_users = ""
+tab_direct = ""
+tab_super_admin = ""
+table_level = ""
+table_relation = ""
+table_target = ""
+table_user = ""
+tabs = ""
+target_org_picker = ""
+target_queue_empty = ""
+target_queue_remove = ""
+target_tenant_picker_title = ""
+target_tenant_required_option = ""
 user_list = ""
 
 [ui.admin.profile]
@@ -1501,6 +1547,8 @@ section = ""
 [ui.admin.tenants.bulk]
 selected_count = ""
 status_placeholder = ""
+type_placeholder = ""
+visibility_placeholder = ""
 
 [ui.admin.tenants.create]
 title = ""
@@ -2575,13 +2623,16 @@ actions = ""
 application = ""
 client_id = ""
 created_at = ""
+creator = ""
 status = ""
 type = ""
 
 [ui.dev.clients.type]
+headless = ""
 pkce = ""
 pkce_headless = ""
 private = ""
+private_headless = ""
 
 [ui.dev.dashboard]
 ready_badge = ""
diff --git a/orgfront/src/features/orgchart/pickerTree.ts b/orgfront/src/features/orgchart/pickerTree.ts
index 5ddd23f0..ea4ce322 100644
--- a/orgfront/src/features/orgchart/pickerTree.ts
+++ b/orgfront/src/features/orgchart/pickerTree.ts
@@ -134,6 +134,28 @@ export function buildOrgPickerTree({
     usersBySlug.set(slug, list);
   }
 
+  const exposeAllRoots = rootTenantId?.trim().toLowerCase() === "all";
+  const tree = buildTenantFullTree(visibleTenants);
+
+  if (exposeAllRoots) {
+    const rootNodes = tree.subTree.filter((node) => node.type !== "USER_GROUP");
+    const companies = rootNodes.flatMap((root) =>
+      orderHanmacFamilyChildren(root, root.children).filter(
+        (node) => node.type === "COMPANY",
+      ),
+    );
+
+    return {
+      roots: rootNodes.map((node) => tenantToPickerNode(node, usersBySlug)),
+      companies: companies.map((company) => ({
+        id: company.id,
+        name: company.name,
+        companyGroupTenantId: getCompanyGroupId(company, tenants),
+      })),
+      companyGroupId: "all",
+    };
+  }
+
   const companyGroup =
     findTenantByRef(visibleTenants, rootTenantId) ??
     visibleTenants.find(isHanmacFamilyCompanyGroup) ??
@@ -144,10 +166,7 @@ export function buildOrgPickerTree({
 
   const { currentBase } = buildTenantFullTree(visibleTenants, companyGroup.id);
   const groupNode =
-    currentBase ??
-    buildTenantFullTree(visibleTenants).subTree.find(
-      (node) => node.id === companyGroup.id,
-    );
+    currentBase ?? tree.subTree.find((node) => node.id === companyGroup.id);
 
   if (!groupNode) return { roots: [], companies: [], companyGroupId: "" };
 
diff --git a/orgfront/src/features/orgchart/pickerTypes.ts b/orgfront/src/features/orgchart/pickerTypes.ts
index 2644eec9..1342702e 100644
--- a/orgfront/src/features/orgchart/pickerTypes.ts
+++ b/orgfront/src/features/orgchart/pickerTypes.ts
@@ -9,6 +9,8 @@ export type OrgPickerSelection = {
   id: string;
   name: string;
   email?: string;
+  rootTenantName?: string;
+  leafTenantName?: string;
 };
 
 export type OrgPickerResult = {
diff --git a/orgfront/src/features/orgchart/routes/OrgPickerPage.tsx b/orgfront/src/features/orgchart/routes/OrgPickerPage.tsx
index 48c609d1..6b510e71 100644
--- a/orgfront/src/features/orgchart/routes/OrgPickerPage.tsx
+++ b/orgfront/src/features/orgchart/routes/OrgPickerPage.tsx
@@ -40,13 +40,24 @@ function canToggleNode(
   );
 }
 
-function toSelection(node: OrgPickerTreeNode): OrgPickerSelection {
+function toSelection(
+  node: OrgPickerTreeNode,
+  ancestors: OrgPickerTreeNode[] = [],
+): OrgPickerSelection {
   if (node.type === "user") {
+    const tenantAncestors = ancestors.filter(
+      (ancestor) => ancestor.type === "tenant",
+    );
+    const rootTenant = tenantAncestors[0];
+    const leafTenant = tenantAncestors[tenantAncestors.length - 1];
+
     return {
       type: node.type,
       id: node.id,
       name: node.name,
       email: node.user?.email,
+      rootTenantName: rootTenant?.name,
+      leafTenantName: leafTenant?.name,
     };
   }
 
@@ -68,27 +79,49 @@ function collectSelectedNodes({
   includeDescendants: boolean;
   select: OrgPickerSelectableType;
 }) {
-  const selected = new Map<string, OrgPickerTreeNode>();
-  const visit = (node: OrgPickerTreeNode) => {
+  const selected = new Map<
+    string,
+    { node: OrgPickerTreeNode; ancestors: OrgPickerTreeNode[] }
+  >();
+  const addNode = (node: OrgPickerTreeNode, ancestors: OrgPickerTreeNode[]) => {
+    if (canSelectNode(node, select)) {
+      selected.set(nodeKey(node), { node, ancestors });
+    }
+  };
+  const addDescendants = (
+    node: OrgPickerTreeNode,
+    ancestors: OrgPickerTreeNode[],
+  ) => {
+    const visitDescendant = (
+      descendant: OrgPickerTreeNode,
+      descendantAncestors: OrgPickerTreeNode[],
+    ) => {
+      addNode(descendant, descendantAncestors);
+      for (const child of descendant.children) {
+        visitDescendant(child, [...descendantAncestors, descendant]);
+      }
+    };
+
+    for (const child of node.children) {
+      visitDescendant(child, [...ancestors, node]);
+    }
+  };
+  const visit = (node: OrgPickerTreeNode, ancestors: OrgPickerTreeNode[]) => {
     const key = nodeKey(node);
     if (selectedKeys.has(key)) {
-      if (canSelectNode(node, select)) {
-        selected.set(key, node);
-      }
+      addNode(node, ancestors);
       if (includeDescendants && node.type === "tenant") {
-        for (const descendant of flattenDescendants(node)) {
-          if (canSelectNode(descendant, select)) {
-            selected.set(nodeKey(descendant), descendant);
-          }
-        }
+        addDescendants(node, ancestors);
       }
     }
 
-    for (const child of node.children) visit(child);
+    for (const child of node.children) visit(child, [...ancestors, node]);
   };
 
-  for (const root of roots) visit(root);
-  return Array.from(selected.values()).map(toSelection);
+  for (const root of roots) visit(root, []);
+  return Array.from(selected.values()).map(({ node, ancestors }) =>
+    toSelection(node, ancestors),
+  );
 }
 
 function collectCheckedKeys({
diff --git a/orgfront/src/lib/auth.ts b/orgfront/src/lib/auth.ts
index 49cadbfd..5db3c872 100644
--- a/orgfront/src/lib/auth.ts
+++ b/orgfront/src/lib/auth.ts
@@ -1,17 +1,17 @@
 import { UserManager, WebStorageStateStore } from "oidc-client-ts";
 import type { AuthProviderProps } from "react-oidc-context";
+import { buildCommonUserManagerSettings } from "../../../common/core/auth";
 import {
-  buildCommonOidcRuntimeConfig,
-  buildCommonUserManagerSettings,
-} from "../../../common/core/auth";
-import { resolveOrgFrontPublicOrigin } from "./authConfig";
+  buildOrgFrontOidcRuntimeConfig,
+  resolveOrgFrontPublicOrigin,
+} from "./authConfig";
 
 const orgFrontPublicOrigin = resolveOrgFrontPublicOrigin(
   import.meta.env.VITE_ORGFRONT_PUBLIC_URL,
   window.location.origin,
 );
 
-export const oidcConfig: AuthProviderProps = buildCommonOidcRuntimeConfig({
+export const oidcConfig: AuthProviderProps = buildOrgFrontOidcRuntimeConfig({
   authority:
     import.meta.env.VITE_OIDC_AUTHORITY || "http://localhost:5000/oidc",
   clientId: import.meta.env.VITE_OIDC_CLIENT_ID || "orgfront",
diff --git a/orgfront/src/lib/authConfig.test.ts b/orgfront/src/lib/authConfig.test.ts
index 1cd7359c..51b52ad0 100644
--- a/orgfront/src/lib/authConfig.test.ts
+++ b/orgfront/src/lib/authConfig.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   buildOrgFrontAuthRedirectUris,
+  buildOrgFrontOidcRuntimeConfig,
   ORGFRONT_AUTH_CALLBACK_PATH,
   resolveOrgFrontPublicOrigin,
 } from "./authConfig";
@@ -26,4 +27,18 @@ describe("orgfront auth config", () => {
   it("keeps the callback path aligned with the registered redirect path", () => {
     expect(ORGFRONT_AUTH_CALLBACK_PATH).toBe("/auth/callback");
   });
+
+  it("requests offline access and enables refresh-token based renewal", () => {
+    const config = buildOrgFrontOidcRuntimeConfig({
+      authority: "https://sso.hmac.kr/oidc",
+      clientId: "orgfront",
+      origin: "https://org.hmac.kr",
+      userStore: { kind: "test-store" },
+    });
+
+    expect(config.scope.split(/\s+/)).toEqual(
+      expect.arrayContaining(["openid", "offline_access", "profile", "email"]),
+    );
+    expect(config.automaticSilentRenew).toBe(true);
+  });
 });
diff --git a/orgfront/src/lib/authConfig.ts b/orgfront/src/lib/authConfig.ts
index 58140864..d17ace2d 100644
--- a/orgfront/src/lib/authConfig.ts
+++ b/orgfront/src/lib/authConfig.ts
@@ -1,3 +1,8 @@
+import {
+  buildCommonOidcRuntimeConfig,
+  type CommonOidcConfigOptions,
+} from "../../../common/core/auth";
+
 export interface OrgFrontAuthRedirectUris {
   redirectUri: string;
   postLogoutRedirectUri: string;
@@ -31,3 +36,12 @@ export function buildOrgFrontAuthRedirectUris(
     popupRedirectUri: `${publicOrigin}${ORGFRONT_AUTH_CALLBACK_PATH}`,
   };
 }
+
+export function buildOrgFrontOidcRuntimeConfig<TUserStore>(
+  options: Omit<CommonOidcConfigOptions<TUserStore>, "automaticSilentRenew">,
+) {
+  return buildCommonOidcRuntimeConfig({
+    ...options,
+    automaticSilentRenew: true,
+  });
+}
diff --git a/orgfront/tests/orgchart-pan-zoom.spec.ts b/orgfront/tests/orgchart-pan-zoom.spec.ts
index ffb39a54..cde2349c 100644
--- a/orgfront/tests/orgchart-pan-zoom.spec.ts
+++ b/orgfront/tests/orgchart-pan-zoom.spec.ts
@@ -43,6 +43,9 @@ function user(id: string, name: string, companyCode: string) {
     status: "active",
     companyCode,
     grade: "사원",
+    metadata: {
+      additionalAppointments: [{ tenantSlug: companyCode }],
+    },
     createdAt: "2026-04-01T00:00:00.000Z",
     updatedAt: "2026-04-01T00:00:00.000Z",
   };
@@ -338,7 +341,8 @@ test("org chart renders dense member nodes with calculated member columns", asyn
   await expect(page.getByRole("heading", { name: "조직 현황" })).toBeVisible();
 
   const rootNode = page.locator('[data-testid="orgchart-node-root"]');
-  await expect(rootNode).toHaveAttribute("width", /3\d{2}/);
+  await expect(rootNode).toHaveAttribute("width", /\d+/);
+  expect(Number(await rootNode.getAttribute("width"))).toBeGreaterThan(240);
   await expect(rootNode.locator('[data-member-columns="2"]')).toBeVisible();
   await expect(rootNode.getByText("Dense User 10")).toBeVisible();
 });
diff --git a/orgfront/tests/orgfront-auto-login.spec.ts b/orgfront/tests/orgfront-auto-login.spec.ts
index 1257bd09..fc070bee 100644
--- a/orgfront/tests/orgfront-auto-login.spec.ts
+++ b/orgfront/tests/orgfront-auto-login.spec.ts
@@ -46,6 +46,7 @@ test("orgfront login waits for explicit auto parameter", async ({ page }) => {
 
 test("orgfront login auto parameter starts OIDC authorization", async ({
   page,
+  baseURL,
 }) => {
   const oidc = await stubOidcAuthorization(page);
 
@@ -55,11 +56,15 @@ test("orgfront login auto parameter starts OIDC authorization", async ({
 
   const parsed = new URL(oidc.authorizationURL());
   expect(parsed.searchParams.get("client_id")).toBe("orgfront");
-  expect(parsed.searchParams.get("redirect_uri")).toBe(
-    "http://127.0.0.1:4175/auth/callback",
-  );
+  const redirectUri = new URL(parsed.searchParams.get("redirect_uri") ?? "");
+  const appUrl = new URL(baseURL ?? page.url());
+  expect(["localhost", "127.0.0.1"]).toContain(redirectUri.hostname);
+  expect(redirectUri.port).toBe(appUrl.port);
+  expect(redirectUri.pathname).toBe("/auth/callback");
   expect(parsed.searchParams.get("response_type")).toBe("code");
-  expect(parsed.searchParams.get("scope") ?? "").toContain("openid");
+  expect((parsed.searchParams.get("scope") ?? "").split(/\s+/)).toEqual(
+    expect.arrayContaining(["openid", "offline_access", "profile", "email"]),
+  );
 });
 
 test("orgfront login can opt out of default OIDC authorization", async ({
diff --git a/userfront/lib/features/auth/presentation/signup_screen.dart b/userfront/lib/features/auth/presentation/signup_screen.dart
index 80b71823..8dff7355 100644
--- a/userfront/lib/features/auth/presentation/signup_screen.dart
+++ b/userfront/lib/features/auth/presentation/signup_screen.dart
@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:userfront/i18n.dart';
 import '../../../core/i18n/locale_utils.dart';
 import '../../../core/services/auth_proxy_service.dart';
@@ -39,7 +38,6 @@ class _SignupScreenState extends State<SignupScreen> {
   bool _isEmailVerified = false;
   bool _isPhoneVerified = false;
   String _affiliationType = 'GENERAL';
-  bool _isAffiliateLocked = false;
   String? _companyCode;
   bool _termsAccepted = false;
   bool _privacyAccepted = false;
@@ -283,11 +281,9 @@ class _SignupScreenState extends State<SignupScreen> {
 
           if (res['isAffiliate'] == true) {
             _affiliationType = 'AFFILIATE';
-            _isAffiliateLocked = true;
           } else {
             _affiliationType = 'GENERAL';
             _companyCode = null;
-            _isAffiliateLocked = true;
           }
         });