diff --git a/adminfront/src/features/overview/GlobalOverviewPage.tsx b/adminfront/src/features/overview/GlobalOverviewPage.tsx
index 24e8f139..7db5a1cd 100644
--- a/adminfront/src/features/overview/GlobalOverviewPage.tsx
+++ b/adminfront/src/features/overview/GlobalOverviewPage.tsx
@@ -17,6 +17,7 @@ import {
   CardTitle,
 } from "../../components/ui/card";
 import { t } from "../../lib/i18n";
+import PermissionChecker from "./components/PermissionChecker";
 
 const summaryCards = [
   {
diff --git a/adminfront/src/features/tenants/routes/TenantProfilePage.tsx b/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
index 6bfd3610..f75a3f39 100644
--- a/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
@@ -18,7 +18,6 @@ import {
   approveTenant,
   deleteTenant,
   fetchTenant,
-  fetchTenantGroups,
   updateTenant,
 } from "../../../lib/adminApi";
 
@@ -36,17 +35,11 @@ export function TenantProfilePage() {
     queryFn: () => fetchTenant(tenantId),
   });
 
-  const groupsQuery = useQuery({
-    queryKey: ["tenant-groups", { limit: 100 }],
-    queryFn: () => fetchTenantGroups(100, 0),
-  });
-
   const [name, setName] = useState("");
   const [slug, setSlug] = useState("");
   const [description, setDescription] = useState("");
   const [status, setStatus] = useState("active");
   const [domains, setDomains] = useState("");
-  const [tenantGroupId, setTenantGroupId] = useState("");
 
   useEffect(() => {
     if (tenantQuery.data) {
@@ -55,7 +48,6 @@ export function TenantProfilePage() {
       setDescription(tenantQuery.data.description ?? "");
       setStatus(tenantQuery.data.status);
       setDomains(tenantQuery.data.domains?.join(", ") ?? "");
-      setTenantGroupId(tenantQuery.data.tenantGroupId ?? "");
     }
   }, [tenantQuery.data]);
 
@@ -66,7 +58,6 @@ export function TenantProfilePage() {
         slug,
         description: description || undefined,
         status,
-        tenantGroupId: tenantGroupId || undefined,
         domains: domains
           .split(",")
           .map((d) => d.trim())
@@ -145,25 +136,6 @@ export function TenantProfilePage() {
               onChange={(e) => setDescription(e.target.value)}
             />
           </div>
-          <div className="space-y-2">
-            <Label className="text-sm font-semibold">Tenant Group</Label>
-            <select
-              value={tenantGroupId}
-              onChange={(e) => setTenantGroupId(e.target.value)}
-              className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
-            >
-              <option value="">그룹 없음</option>
-              {groupsQuery.data?.items.map((group) => (
-                <option key={group.id} value={group.id}>
-                  {group.name} ({group.slug})
-                </option>
-              ))}
-            </select>
-            <p className="text-xs text-muted-foreground">
-              테넌트가 속할 그룹을 지정합니다. 그룹 관리자는 소속 테넌트에 대한
-              접근 권한을 가집니다.
-            </p>
-          </div>
           <div className="space-y-2">
             <Label className="text-sm font-semibold">
               Allowed Domains (Comma separated)
diff --git a/adminfront/src/lib/adminApi.ts b/adminfront/src/lib/adminApi.ts
index e6ac69dd..67037a04 100644
--- a/adminfront/src/lib/adminApi.ts
+++ b/adminfront/src/lib/adminApi.ts
@@ -139,6 +139,27 @@ export async function approveTenant(tenantId: string) {
   return data;
 }
 
+export type TenantAdmin = {
+  id: string;
+  name: string;
+  email: string;
+};
+
+export async function fetchTenantAdmins(tenantId: string) {
+  const { data } = await apiClient.get<TenantAdmin[]>(
+    `/v1/admin/tenants/${tenantId}/admins`,
+  );
+  return data;
+}
+
+export async function addTenantAdmin(tenantId: string, userId: string) {
+  await apiClient.post(`/v1/admin/tenants/${tenantId}/admins/${userId}`);
+}
+
+export async function removeTenantAdmin(tenantId: string, userId: string) {
+  await apiClient.delete(`/v1/admin/tenants/${tenantId}/admins/${userId}`);
+}
+
 // Group Management
 export type GroupMember = {
   id: string;
diff --git a/adminfront/src/lib/i18n.ts b/adminfront/src/lib/i18n.ts
index 481e3b91..53540cb7 100644
--- a/adminfront/src/lib/i18n.ts
+++ b/adminfront/src/lib/i18n.ts
@@ -108,10 +108,10 @@ function detectLocale(): Locale {
 }
 
 // eslint-disable-next-line import/no-unresolved
-import enRaw from "../../../locales/en.toml?raw";
+import enRaw from "../locales/en.toml?raw";
 // Vite ?raw import는 런타임 상수로 번들됩니다.
 // eslint-disable-next-line import/no-unresolved
-import koRaw from "../../../locales/ko.toml?raw";
+import koRaw from "../locales/ko.toml?raw";
 
 const translations: Record<Locale, TomlObject> = {
   ko: parseToml(koRaw),
diff --git a/adminfront/src/locales/en.toml b/adminfront/src/locales/en.toml
index da0f4024..26d7f7ae 100644
--- a/adminfront/src/locales/en.toml
+++ b/adminfront/src/locales/en.toml
@@ -355,8 +355,32 @@ title_with_code = "Title With Code"
 type = "Type"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "$NormalizedCode"
+"$normalizedCode" = "{{error}}"
 settings_disabled = "Account settings are currently unavailable."
+invalid_session = "Your session has expired. Please sign in again."
+verification_required = "Additional verification is required. Please follow the instructions."
+recovery_expired = "The recovery link has expired. Please request a new one."
+recovery_invalid = "The recovery link is invalid."
+rate_limited = "Too many requests. Please try again later."
+not_found = "The requested page could not be found."
+bad_request = "Please check your input."
+password_or_email_mismatch = "Email or password does not match."
+
+[msg.userfront.error.ory]
+"$normalizedCode" = "{{error}}"
+access_denied = "The user denied the consent request."
+consent_required = "Consent is required to continue."
+interaction_required = "Additional interaction is required. Please try again."
+invalid_client = "Client authentication failed."
+invalid_grant = "The authorization grant is invalid or expired."
+invalid_request = "The request is invalid."
+invalid_scope = "The requested scope is invalid."
+login_required = "Login is required."
+request_forbidden = "The request was forbidden."
+server_error = "An authentication server error occurred."
+temporarily_unavailable = "The authentication server is temporarily unavailable."
+unauthorized_client = "The client is not authorized for this request."
+unsupported_response_type = "The response type is not supported."
 
 [msg.userfront.forgot]
 description = "Description"
@@ -372,10 +396,10 @@ link_failed = "Link Failed"
 link_send_failed = "Link Send Failed"
 link_sent_email = "Link Sent Email"
 link_sent_phone = "Link Sent Phone"
-link_timeout = "Link Timeout"
-no_account = "No Account"
+link_timeout = "Time expired."
+no_account = "New to Baron?"
 oidc_failed = "OIDC Failed"
-qr_expired = "QR Expired"
+qr_expired = "Time expired."
 qr_init_failed = "QR Init Failed"
 qr_login_required = "QR Login Required"
 token_missing = "Token Missing"
@@ -383,7 +407,7 @@ verification_failed = "Verification Failed"
 
 [msg.userfront.login.link]
 approved = "Approved"
-helper = "Helper"
+helper = "Sending you a login link"
 missing_login_id = "Missing Login Id"
 missing_phone = "Missing Phone"
 resend_wait = "Resend Wait"
@@ -871,6 +895,9 @@ retry = "Retry"
 save = "Save"
 search = "Search"
 show_more = "Show More"
+language = "Language"
+language_ko = "한국어"
+language_en = "English"
 theme_dark = "Dark"
 theme_light = "Light"
 theme_toggle = "Theme Toggle"
@@ -1091,7 +1118,7 @@ subtitle = "Manage your applications"
 
 
 [ui.userfront]
-app_title = "App Title"
+app_title = "Baron SW Portal"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1161,7 +1188,7 @@ signup = "Signup"
 submit = "Submit"
 
 [ui.userfront.login.field]
-login_id = "Login Id"
+login_id = "Emain or Phone Number"
 password = "Password"
 
 [ui.userfront.login.link]
@@ -1175,7 +1202,7 @@ title = "Title"
 [ui.userfront.login.qr]
 expired = "Expired"
 refresh = "Refresh"
-remaining = "Remaining"
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = "Digits"
@@ -1184,9 +1211,9 @@ prefix = "Prefix"
 submit = "Submit"
 
 [ui.userfront.login.tabs]
-link = "Link"
+link = "Link/Code"
 password = "Password"
-qr = "QR"
+qr = "QR Code"
 
 [ui.userfront.login.unregistered]
 action = "Action"
@@ -1311,6 +1338,6 @@ logout = "Logout"
 overview = "Overview"
 relying_parties = "Apps (RP)"
 tenant_dashboard = "Tenant Dashboard"
-tenant_groups = "Tenant Groups"
+user_groups = "User Groups"
 tenants = "Tenants"
 users = "Users"
diff --git a/adminfront/src/locales/ko.toml b/adminfront/src/locales/ko.toml
index ae257cd2..73958bf0 100644
--- a/adminfront/src/locales/ko.toml
+++ b/adminfront/src/locales/ko.toml
@@ -355,8 +355,32 @@ title_with_code = "오류: {{code}}"
 type = "오류 종류: {{type}}"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "에러가 계속되면 관리자에게 문의해주세요"
+"$normalizedCode" = "{{error}}"
 settings_disabled = "현재 계정 설정 화면은 준비 중입니다."
+invalid_session = "세션이 만료되었습니다. 다시 로그인해 주세요."
+verification_required = "추가 인증이 필요합니다. 안내에 따라 진행해 주세요."
+recovery_expired = "재설정 링크가 만료되었습니다. 다시 요청해 주세요."
+recovery_invalid = "재설정 링크가 유효하지 않습니다."
+rate_limited = "요청이 많습니다. 잠시 후 다시 시도해 주세요."
+not_found = "요청한 페이지를 찾을 수 없습니다."
+bad_request = "입력값을 확인해 주세요."
+password_or_email_mismatch = "이메일 혹은 비밀번호가 일치하지 않습니다."
+
+[msg.userfront.error.ory]
+"$normalizedCode" = "{{error}}"
+access_denied = "사용자가 동의를 거부했습니다."
+consent_required = "앱 접근 동의가 필요합니다."
+interaction_required = "추가 상호작용이 필요합니다. 다시 시도해 주세요."
+invalid_client = "클라이언트 인증 정보가 유효하지 않습니다."
+invalid_grant = "인증 요청이 만료되었거나 유효하지 않습니다."
+invalid_request = "잘못된 요청입니다."
+invalid_scope = "요청한 권한 범위가 유효하지 않습니다."
+login_required = "로그인이 필요합니다."
+request_forbidden = "요청이 거부되었습니다."
+server_error = "인증 서버 오류가 발생했습니다."
+temporarily_unavailable = "인증 서버를 일시적으로 사용할 수 없습니다."
+unauthorized_client = "해당 클라이언트는 이 요청을 수행할 수 없습니다."
+unsupported_response_type = "지원하지 않는 응답 타입입니다."
 
 [msg.userfront.forgot]
 description = "계정과 연결된 이메일 주소 또는 휴대폰 번호를 입력하시면, 비밀번호를 재설정할 수 있는 링크를 보내드립니다."
@@ -372,10 +396,10 @@ link_failed = "오류: {{error}}"
 link_send_failed = "전송 실패: {{error}}"
 link_sent_email = "입력하신 이메일로 로그인 링크를 보냈습니다."
 link_sent_phone = "입력하신 번호로 로그인 링크를 보냈습니다."
-link_timeout = "로그인 요청 시간이 초과되었습니다."
+link_timeout = "시간이 경과되었습니다."
 no_account = "계정이 없으신가요?"
 oidc_failed = "OIDC 로그인 처리에 실패했습니다. 다시 시도해 주세요."
-qr_expired = "QR 세션이 만료되었습니다."
+qr_expired = "시간이 경과되었습니다."
 qr_init_failed = "QR 초기화에 실패했습니다: {{error}}"
 qr_login_required = "로그인 한 상태여야 QR 스캔으로 로그인 할 수 있습니다"
 token_missing = "로그인 토큰을 확인할 수 없습니다."
@@ -871,6 +895,9 @@ retry = "다시 시도"
 save = "저장"
 search = "검색"
 show_more = "+ 더보기"
+language = "언어"
+language_ko = "한국어"
+language_en = "English"
 theme_dark = "Dark"
 theme_light = "Light"
 theme_toggle = "테마 전환"
@@ -1091,7 +1118,7 @@ subtitle = "Manage your applications"
 
 
 [ui.userfront]
-app_title = "Baron 로그인"
+app_title = "Baron SW 포탈"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1311,6 +1338,6 @@ logout = "로그아웃"
 overview = "개요"
 relying_parties = "애플리케이션(RP)"
 tenant_dashboard = "테넌트 대시보드"
-tenant_groups = "테넌트 그룹"
+user_groups = "유저 그룹"
 tenants = "테넌트"
 users = "사용자"
diff --git a/adminfront/src/locales/template.toml b/adminfront/src/locales/template.toml
index e9e3d536..d3f46c56 100644
--- a/adminfront/src/locales/template.toml
+++ b/adminfront/src/locales/template.toml
@@ -355,8 +355,32 @@ title_with_code = ""
 type = ""
 
 [msg.userfront.error.whitelist]
-$normalizedCode = ""
+"$normalizedCode" = ""
 settings_disabled = ""
+invalid_session = ""
+verification_required = ""
+recovery_expired = ""
+recovery_invalid = ""
+rate_limited = ""
+not_found = ""
+bad_request = ""
+password_or_email_mismatch = ""
+
+[msg.userfront.error.ory]
+"$normalizedCode" = ""
+access_denied = ""
+consent_required = ""
+interaction_required = ""
+invalid_client = ""
+invalid_grant = ""
+invalid_request = ""
+invalid_scope = ""
+login_required = ""
+request_forbidden = ""
+server_error = ""
+temporarily_unavailable = ""
+unauthorized_client = ""
+unsupported_response_type = ""
 
 [msg.userfront.forgot]
 description = ""
@@ -668,7 +692,7 @@ logout = ""
 overview = ""
 relying_parties = ""
 tenant_dashboard = ""
-tenant_groups = ""
+user_groups = ""
 tenants = ""
 users = ""
 
@@ -883,6 +907,9 @@ retry = ""
 save = ""
 search = ""
 show_more = ""
+language = ""
+language_ko = ""
+language_en = ""
 theme_dark = ""
 theme_light = ""
 theme_toggle = ""
@@ -1187,7 +1214,7 @@ title = ""
 [ui.userfront.login.qr]
 expired = ""
 refresh = ""
-remaining = ""
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = ""
diff --git a/devfront/src/lib/i18n.ts b/devfront/src/lib/i18n.ts
index 481e3b91..53540cb7 100644
--- a/devfront/src/lib/i18n.ts
+++ b/devfront/src/lib/i18n.ts
@@ -108,10 +108,10 @@ function detectLocale(): Locale {
 }
 
 // eslint-disable-next-line import/no-unresolved
-import enRaw from "../../../locales/en.toml?raw";
+import enRaw from "../locales/en.toml?raw";
 // Vite ?raw import는 런타임 상수로 번들됩니다.
 // eslint-disable-next-line import/no-unresolved
-import koRaw from "../../../locales/ko.toml?raw";
+import koRaw from "../locales/ko.toml?raw";
 
 const translations: Record<Locale, TomlObject> = {
   ko: parseToml(koRaw),
diff --git a/devfront/src/locales/en.toml b/devfront/src/locales/en.toml
index da0f4024..26d7f7ae 100644
--- a/devfront/src/locales/en.toml
+++ b/devfront/src/locales/en.toml
@@ -355,8 +355,32 @@ title_with_code = "Title With Code"
 type = "Type"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "$NormalizedCode"
+"$normalizedCode" = "{{error}}"
 settings_disabled = "Account settings are currently unavailable."
+invalid_session = "Your session has expired. Please sign in again."
+verification_required = "Additional verification is required. Please follow the instructions."
+recovery_expired = "The recovery link has expired. Please request a new one."
+recovery_invalid = "The recovery link is invalid."
+rate_limited = "Too many requests. Please try again later."
+not_found = "The requested page could not be found."
+bad_request = "Please check your input."
+password_or_email_mismatch = "Email or password does not match."
+
+[msg.userfront.error.ory]
+"$normalizedCode" = "{{error}}"
+access_denied = "The user denied the consent request."
+consent_required = "Consent is required to continue."
+interaction_required = "Additional interaction is required. Please try again."
+invalid_client = "Client authentication failed."
+invalid_grant = "The authorization grant is invalid or expired."
+invalid_request = "The request is invalid."
+invalid_scope = "The requested scope is invalid."
+login_required = "Login is required."
+request_forbidden = "The request was forbidden."
+server_error = "An authentication server error occurred."
+temporarily_unavailable = "The authentication server is temporarily unavailable."
+unauthorized_client = "The client is not authorized for this request."
+unsupported_response_type = "The response type is not supported."
 
 [msg.userfront.forgot]
 description = "Description"
@@ -372,10 +396,10 @@ link_failed = "Link Failed"
 link_send_failed = "Link Send Failed"
 link_sent_email = "Link Sent Email"
 link_sent_phone = "Link Sent Phone"
-link_timeout = "Link Timeout"
-no_account = "No Account"
+link_timeout = "Time expired."
+no_account = "New to Baron?"
 oidc_failed = "OIDC Failed"
-qr_expired = "QR Expired"
+qr_expired = "Time expired."
 qr_init_failed = "QR Init Failed"
 qr_login_required = "QR Login Required"
 token_missing = "Token Missing"
@@ -383,7 +407,7 @@ verification_failed = "Verification Failed"
 
 [msg.userfront.login.link]
 approved = "Approved"
-helper = "Helper"
+helper = "Sending you a login link"
 missing_login_id = "Missing Login Id"
 missing_phone = "Missing Phone"
 resend_wait = "Resend Wait"
@@ -871,6 +895,9 @@ retry = "Retry"
 save = "Save"
 search = "Search"
 show_more = "Show More"
+language = "Language"
+language_ko = "한국어"
+language_en = "English"
 theme_dark = "Dark"
 theme_light = "Light"
 theme_toggle = "Theme Toggle"
@@ -1091,7 +1118,7 @@ subtitle = "Manage your applications"
 
 
 [ui.userfront]
-app_title = "App Title"
+app_title = "Baron SW Portal"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1161,7 +1188,7 @@ signup = "Signup"
 submit = "Submit"
 
 [ui.userfront.login.field]
-login_id = "Login Id"
+login_id = "Emain or Phone Number"
 password = "Password"
 
 [ui.userfront.login.link]
@@ -1175,7 +1202,7 @@ title = "Title"
 [ui.userfront.login.qr]
 expired = "Expired"
 refresh = "Refresh"
-remaining = "Remaining"
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = "Digits"
@@ -1184,9 +1211,9 @@ prefix = "Prefix"
 submit = "Submit"
 
 [ui.userfront.login.tabs]
-link = "Link"
+link = "Link/Code"
 password = "Password"
-qr = "QR"
+qr = "QR Code"
 
 [ui.userfront.login.unregistered]
 action = "Action"
@@ -1311,6 +1338,6 @@ logout = "Logout"
 overview = "Overview"
 relying_parties = "Apps (RP)"
 tenant_dashboard = "Tenant Dashboard"
-tenant_groups = "Tenant Groups"
+user_groups = "User Groups"
 tenants = "Tenants"
 users = "Users"
diff --git a/devfront/src/locales/ko.toml b/devfront/src/locales/ko.toml
index ae257cd2..73958bf0 100644
--- a/devfront/src/locales/ko.toml
+++ b/devfront/src/locales/ko.toml
@@ -355,8 +355,32 @@ title_with_code = "오류: {{code}}"
 type = "오류 종류: {{type}}"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "에러가 계속되면 관리자에게 문의해주세요"
+"$normalizedCode" = "{{error}}"
 settings_disabled = "현재 계정 설정 화면은 준비 중입니다."
+invalid_session = "세션이 만료되었습니다. 다시 로그인해 주세요."
+verification_required = "추가 인증이 필요합니다. 안내에 따라 진행해 주세요."
+recovery_expired = "재설정 링크가 만료되었습니다. 다시 요청해 주세요."
+recovery_invalid = "재설정 링크가 유효하지 않습니다."
+rate_limited = "요청이 많습니다. 잠시 후 다시 시도해 주세요."
+not_found = "요청한 페이지를 찾을 수 없습니다."
+bad_request = "입력값을 확인해 주세요."
+password_or_email_mismatch = "이메일 혹은 비밀번호가 일치하지 않습니다."
+
+[msg.userfront.error.ory]
+"$normalizedCode" = "{{error}}"
+access_denied = "사용자가 동의를 거부했습니다."
+consent_required = "앱 접근 동의가 필요합니다."
+interaction_required = "추가 상호작용이 필요합니다. 다시 시도해 주세요."
+invalid_client = "클라이언트 인증 정보가 유효하지 않습니다."
+invalid_grant = "인증 요청이 만료되었거나 유효하지 않습니다."
+invalid_request = "잘못된 요청입니다."
+invalid_scope = "요청한 권한 범위가 유효하지 않습니다."
+login_required = "로그인이 필요합니다."
+request_forbidden = "요청이 거부되었습니다."
+server_error = "인증 서버 오류가 발생했습니다."
+temporarily_unavailable = "인증 서버를 일시적으로 사용할 수 없습니다."
+unauthorized_client = "해당 클라이언트는 이 요청을 수행할 수 없습니다."
+unsupported_response_type = "지원하지 않는 응답 타입입니다."
 
 [msg.userfront.forgot]
 description = "계정과 연결된 이메일 주소 또는 휴대폰 번호를 입력하시면, 비밀번호를 재설정할 수 있는 링크를 보내드립니다."
@@ -372,10 +396,10 @@ link_failed = "오류: {{error}}"
 link_send_failed = "전송 실패: {{error}}"
 link_sent_email = "입력하신 이메일로 로그인 링크를 보냈습니다."
 link_sent_phone = "입력하신 번호로 로그인 링크를 보냈습니다."
-link_timeout = "로그인 요청 시간이 초과되었습니다."
+link_timeout = "시간이 경과되었습니다."
 no_account = "계정이 없으신가요?"
 oidc_failed = "OIDC 로그인 처리에 실패했습니다. 다시 시도해 주세요."
-qr_expired = "QR 세션이 만료되었습니다."
+qr_expired = "시간이 경과되었습니다."
 qr_init_failed = "QR 초기화에 실패했습니다: {{error}}"
 qr_login_required = "로그인 한 상태여야 QR 스캔으로 로그인 할 수 있습니다"
 token_missing = "로그인 토큰을 확인할 수 없습니다."
@@ -871,6 +895,9 @@ retry = "다시 시도"
 save = "저장"
 search = "검색"
 show_more = "+ 더보기"
+language = "언어"
+language_ko = "한국어"
+language_en = "English"
 theme_dark = "Dark"
 theme_light = "Light"
 theme_toggle = "테마 전환"
@@ -1091,7 +1118,7 @@ subtitle = "Manage your applications"
 
 
 [ui.userfront]
-app_title = "Baron 로그인"
+app_title = "Baron SW 포탈"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1311,6 +1338,6 @@ logout = "로그아웃"
 overview = "개요"
 relying_parties = "애플리케이션(RP)"
 tenant_dashboard = "테넌트 대시보드"
-tenant_groups = "테넌트 그룹"
+user_groups = "유저 그룹"
 tenants = "테넌트"
 users = "사용자"
diff --git a/devfront/src/locales/template.toml b/devfront/src/locales/template.toml
index e9e3d536..d3f46c56 100644
--- a/devfront/src/locales/template.toml
+++ b/devfront/src/locales/template.toml
@@ -355,8 +355,32 @@ title_with_code = ""
 type = ""
 
 [msg.userfront.error.whitelist]
-$normalizedCode = ""
+"$normalizedCode" = ""
 settings_disabled = ""
+invalid_session = ""
+verification_required = ""
+recovery_expired = ""
+recovery_invalid = ""
+rate_limited = ""
+not_found = ""
+bad_request = ""
+password_or_email_mismatch = ""
+
+[msg.userfront.error.ory]
+"$normalizedCode" = ""
+access_denied = ""
+consent_required = ""
+interaction_required = ""
+invalid_client = ""
+invalid_grant = ""
+invalid_request = ""
+invalid_scope = ""
+login_required = ""
+request_forbidden = ""
+server_error = ""
+temporarily_unavailable = ""
+unauthorized_client = ""
+unsupported_response_type = ""
 
 [msg.userfront.forgot]
 description = ""
@@ -668,7 +692,7 @@ logout = ""
 overview = ""
 relying_parties = ""
 tenant_dashboard = ""
-tenant_groups = ""
+user_groups = ""
 tenants = ""
 users = ""
 
@@ -883,6 +907,9 @@ retry = ""
 save = ""
 search = ""
 show_more = ""
+language = ""
+language_ko = ""
+language_en = ""
 theme_dark = ""
 theme_light = ""
 theme_toggle = ""
@@ -1187,7 +1214,7 @@ title = ""
 [ui.userfront.login.qr]
 expired = ""
 refresh = ""
-remaining = ""
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = ""
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2dd4576d..f5f94a09 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -61,6 +61,7 @@ services:
             - "${ADMIN_PORT:-5173}:5173"
         volumes:
             - ./adminfront:/app
+            - ./locales:/locales
             - /app/node_modules
         networks:
             - baron_net
@@ -80,6 +81,7 @@ services:
             - "${DEVFRONT_PORT:-5174}:5173"
         volumes:
             - ./devfront:/app
+            - ./locales:/locales
             - /app/node_modules
         networks:
             - baron_net