From dfa2fc24066ce0a062e0c82b1e38b05b3cbd1738 Mon Sep 17 00:00:00 2001
From: Lectom C Han <hchy0730@gmail.com>
Date: Thu, 12 Feb 2026 21:25:26 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20i18n=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F?=
 =?UTF-8?q?=20userfront=20=EB=A1=9C=EA=B7=B8=EC=9D=B8/=EB=A1=9C=EC=BC=80?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                                 |  18 +
 .gitea/workflows/code_check.yml               | 205 ++--
 README.md                                     |   4 +-
 README_en.md                                  |   4 +-
 .../components/common/LanguageSelector.tsx    |  57 ++
 .../src/components/layout/AppLayout.tsx       |   2 +
 backend/internal/handler/auth_handler.go      |  17 +-
 .../handler/auth_handler_async_test.go        | 251 +++++
 backend/internal/handler/user_handler.go      |  44 +-
 .../components/common/LanguageSelector.tsx    |  57 ++
 devfront/src/components/layout/AppLayout.tsx  |   2 +
 docker-compose.yaml                           |  10 +-
 docker/compose.ory.yaml                       | 253 ++---
 docker/docker-compose.staging.template.yaml   |   4 +-
 docker/ory/kratos/kratos.yml                  |  13 +-
 docker/ory/oathkeeper/entrypoint.sh           |   8 +-
 docker/staging_pull_compose.template.yaml     | 400 ++++++++
 docs/SoT_Architecture_Policy.md               |  44 +
 docs/i18n.md                                  |   1 +
 docs/trouble-shooting/userfront-locale.md     |  86 ++
 locales/en.toml                               |  41 +-
 locales/ko.toml                               |  29 +-
 locales/template.toml                         |  25 +-
 scripts/sync_userfront_locales.sh             |  47 +
 tools/i18n-scanner/report.js                  | 237 +++++
 userfront/Dockerfile                          |   9 +-
 userfront/assets/translations/en.toml         | 536 +++++++++++
 userfront/assets/translations/ko.toml         | 536 +++++++++++
 userfront/assets/translations/template.toml   | 536 +++++++++++
 userfront/lib/core/i18n/locale_gate.dart      |  51 +
 userfront/lib/core/i18n/locale_storage.dart   |   7 +
 .../lib/core/i18n/locale_storage_stub.dart    |  11 +
 .../lib/core/i18n/locale_storage_web.dart     | 120 +++
 userfront/lib/core/i18n/locale_utils.dart     |  69 ++
 .../lib/core/i18n/toml_asset_loader.dart      |  22 +
 .../lib/core/services/auth_proxy_service.dart | 225 ++---
 .../lib/core/services/web_window_stub.dart    |   2 +
 .../lib/core/services/web_window_web.dart     |   4 +
 .../lib/core/widgets/language_selector.dart   |  65 ++
 .../auth/presentation/error_screen.dart       |  63 +-
 .../presentation/forgot_password_screen.dart  |  50 +-
 .../auth/presentation/login_screen.dart       | 882 ++++++++++--------
 .../presentation/login_success_screen.dart    |  29 +-
 .../auth/presentation/qr_scan_screen.dart     |  33 +-
 .../presentation/reset_password_screen.dart   |  79 +-
 .../auth/presentation/signup_screen.dart      | 442 +++++----
 .../dashboard/domain/dashboard_providers.dart |   1 -
 .../presentation/dashboard_screen.dart        | 633 ++++++++-----
 .../data/repositories/profile_repository.dart |  15 +-
 .../presentation/pages/profile_page.dart      | 266 +++---
 userfront/lib/i18n.dart                       |  50 +-
 userfront/lib/main.dart                       | 425 +++++----
 userfront/pubspec.lock                        | 190 +++-
 userfront/pubspec.yaml                        |   8 +-
 userfront/test/helpers/web_storage.dart       |   5 +
 userfront/test/helpers/web_storage_stub.dart  |  21 +
 userfront/test/helpers/web_storage_web.dart   |  37 +
 userfront/test/locale_storage_web_test.dart   |  88 ++
 userfront/test/locale_utils_test.dart         |  66 ++
 userfront/test/widget_test.dart               |  23 +-
 60 files changed, 5724 insertions(+), 1734 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 adminfront/src/components/common/LanguageSelector.tsx
 create mode 100644 backend/internal/handler/auth_handler_async_test.go
 create mode 100644 devfront/src/components/common/LanguageSelector.tsx
 create mode 100644 docker/staging_pull_compose.template.yaml
 create mode 100644 docs/SoT_Architecture_Policy.md
 create mode 100644 docs/trouble-shooting/userfront-locale.md
 create mode 100755 scripts/sync_userfront_locales.sh
 create mode 100644 tools/i18n-scanner/report.js
 create mode 100644 userfront/assets/translations/en.toml
 create mode 100644 userfront/assets/translations/ko.toml
 create mode 100644 userfront/assets/translations/template.toml
 create mode 100644 userfront/lib/core/i18n/locale_gate.dart
 create mode 100644 userfront/lib/core/i18n/locale_storage.dart
 create mode 100644 userfront/lib/core/i18n/locale_storage_stub.dart
 create mode 100644 userfront/lib/core/i18n/locale_storage_web.dart
 create mode 100644 userfront/lib/core/i18n/locale_utils.dart
 create mode 100644 userfront/lib/core/i18n/toml_asset_loader.dart
 create mode 100644 userfront/lib/core/widgets/language_selector.dart
 create mode 100644 userfront/test/helpers/web_storage.dart
 create mode 100644 userfront/test/helpers/web_storage_stub.dart
 create mode 100644 userfront/test/helpers/web_storage_web.dart
 create mode 100644 userfront/test/locale_storage_web_test.dart
 create mode 100644 userfront/test/locale_utils_test.dart

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..8d99b854
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,18 @@
+.git
+.gitea
+.codex
+.env
+.env.*
+**/.dart_tool
+**/.packages
+**/build
+**/node_modules
+**/dist
+**/.next
+**/.cache
+**/coverage
+**/tmp
+**/logs
+**/*.log
+**/*.swp
+**/.DS_Store
diff --git a/.gitea/workflows/code_check.yml b/.gitea/workflows/code_check.yml
index 3c159b23..c296e360 100644
--- a/.gitea/workflows/code_check.yml
+++ b/.gitea/workflows/code_check.yml
@@ -1,118 +1,125 @@
 name: Code Check
 
 on:
-  workflow_dispatch:
-    inputs:
-      run_lint:
-        description: "Run linters for Go and Flutter"
-        required: true
-        type: boolean
-        default: true
-      run_backend_tests:
-        description: "Run backend Go tests"
-        required: true
-        type: boolean
-        default: true
-      run_userfront_tests:
-        description: "Run userfront Flutter tests"
-        required: true
-        type: boolean
-        default: true
+    pull_request:
+        branches:
+            - dev
+    workflow_dispatch:
+        inputs:
+            run_lint:
+                description: "Run linters for Go and Flutter"
+                required: true
+                type: boolean
+                default: true
+            run_backend_tests:
+                description: "Run backend Go tests"
+                required: true
+                type: boolean
+                default: true
+            run_userfront_tests:
+                description: "Run userfront Flutter tests"
+                required: true
+                type: boolean
+                default: true
 
 jobs:
-  lint:
-    if: ${{ inputs.run_lint == true }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+    lint:
+        if: ${{ github.event_name != 'workflow_dispatch' || inputs.run_lint == true }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
 
-      - name: i18n resource check
-        run: |
-          node tools/i18n-scanner/index.js
+            - name: i18n resource check
+              run: |
+                  mkdir -p reports
+                  node tools/i18n-scanner/index.js
+                  node tools/i18n-scanner/report.js
+                  cat reports/i18n-report.txt
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.25"
-          cache-dependency-path: backend/go.sum
+            - name: Setup Go
+              uses: actions/setup-go@v5
+              with:
+                  go-version: "1.25"
+                  cache-dependency-path: backend/go.sum
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: "stable"
-          cache: true
+            - name: Setup Flutter
+              uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  cache: true
 
-      - name: Lint Go backend
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.59
-          working-directory: backend
-          args: --enable-only=gofmt,gofumpt
+            - name: Lint Go backend
+              uses: golangci/golangci-lint-action@v6
+              with:
+                  version: v1.59
+                  working-directory: backend
+                  args: --enable-only=gofmt,gofumpt
 
-      - name: Analyze Flutter userfront
-        run: |
-          cd userfront
-          flutter analyze --no-fatal-warnings --no-fatal-infos
+            - name: Analyze Flutter userfront
+              run: |
+                  cd userfront
+                  flutter analyze --no-fatal-warnings --no-fatal-infos
 
-  backend-tests:
-    needs: lint
-    if: ${{ inputs.run_backend_tests == true }}
-    runs-on: ubuntu-latest
-    services:
-      redis:
-        image: redis:7-alpine
-        options: >
-          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
-      clickhouse:
-        image: clickhouse/clickhouse-server:24.6
-        options: >
-          --health-cmd "wget -qO- 'http://localhost:8123/ping'" --health-interval 10s --health-timeout 5s --health-retries 5
+    backend-tests:
+        needs: lint
+        if: ${{ github.event_name != 'workflow_dispatch' || inputs.run_backend_tests == true }}
+        runs-on: ubuntu-latest
+        services:
+            redis:
+                image: redis:7-alpine
+                options: >
+                    --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+            clickhouse:
+                image: clickhouse/clickhouse-server:24.6
+                options: >
+                    --health-cmd "wget -qO- 'http://localhost:8123/ping'" --health-interval 10s --health-timeout 5s --health-retries 5
 
-    env:
-      REDIS_ADDR: redis:6379
-      CLICKHOUSE_HOST: clickhouse
-      CLICKHOUSE_PORT_NATIVE: 9000
+        env:
+            REDIS_ADDR: redis:6379
+            CLICKHOUSE_HOST: clickhouse
+            CLICKHOUSE_PORT_NATIVE: 9000
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.25"
-          cache-dependency-path: backend/go.sum
+            - name: Setup Go
+              uses: actions/setup-go@v5
+              with:
+                  go-version: "1.25"
+                  cache-dependency-path: backend/go.sum
 
-      - name: Run backend tests
-        run: |
-          cd backend
-          go test -v ./...
+            - name: Run backend tests
+              run: |
+                  cd backend
+                  go test -v ./...
 
-  userfront-tests:
-    needs: lint
-    if: ${{ inputs.run_userfront_tests == true }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+    userfront-tests:
+        needs: lint
+        if: ${{ github.event_name != 'workflow_dispatch' || inputs.run_userfront_tests == true }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: "stable"
-          cache: true
+            - name: Setup Flutter
+              uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  cache: true
 
-      - name: Run userfront tests
-        run: |
-          cd userfront
-          if [ -d test ]; then
-            flutter test
-          else
-            echo "No userfront tests: skipping (test/ directory not found)."
-          fi
+            - name: Run userfront tests
+              run: |
+                  cd userfront
+                  if [ -d test ]; then
+                    flutter test
+                    flutter test --platform chrome test/locale_storage_web_test.dart
+                  else
+                    echo "No userfront tests: skipping (test/ directory not found)."
+                  fi
diff --git a/README.md b/README.md
index 7a870483..5268d366 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ flowchart
   - userfront가 바라보는 backend
 
 ### 2. UserFront(Flutter Web/App)
-- **Framework**: Flutter 3.32+
+- **Framework**: Flutter 3.38.0+
 - **Key Packages**: `flutter_riverpod`, `go_router`
 - **Features**:
   - 탭 기반 로그인 UI (비밀번호 기반 / 링크 기반 / QR 기반 등)
@@ -147,7 +147,7 @@ Kratos가 사용자 SoT이며 Hydra는 순수 OIDC 토큰 엔진입니다. 비
 
 ### 사전 요구사항 (Prerequisites)
 - Docker & Docker Compose
-- Flutter SDK (로컬 개발용)
+- Flutter SDK (로컬 개발용, 3.38.0+)
 - Go (로컬 백엔드 개발용)
 
 ### 환경 설정 (Environment Setup)
diff --git a/README_en.md b/README_en.md
index 8d54e892..5ba1130b 100644
--- a/README_en.md
+++ b/README_en.md
@@ -6,7 +6,7 @@ It leverages **Descope** for secure, passwordless authentication (Enchanted Link
 ## 🏗 Architecture
 
 ### 1. Frontend (Flutter Web)
-- **Framework**: Flutter 3.32+
+- **Framework**: Flutter 3.38.0+
 - **Organization**: `kr.co.baroncs`
 - **Key Packages**: `descope`, `flutter_riverpod`, `go_router`
 - **Features**:
@@ -32,7 +32,7 @@ It leverages **Descope** for secure, passwordless authentication (Enchanted Link
 
 ### Prerequisites
 - Docker & Docker Compose
-- Flutter SDK (for local development)
+- Flutter SDK (for local development, 3.38.0+)
 - Go (for local backend development)
 
 ### Environment Setup
diff --git a/adminfront/src/components/common/LanguageSelector.tsx b/adminfront/src/components/common/LanguageSelector.tsx
new file mode 100644
index 00000000..fe77df72
--- /dev/null
+++ b/adminfront/src/components/common/LanguageSelector.tsx
@@ -0,0 +1,57 @@
+import { useState } from "react";
+import { t } from "../../lib/i18n";
+
+const LOCALE_STORAGE_KEY = "locale";
+const SUPPORTED_LOCALES = ["ko", "en"] as const;
+
+type Locale = (typeof SUPPORTED_LOCALES)[number];
+
+function resolveLocale(): Locale {
+  if (typeof window === "undefined") {
+    return "ko";
+  }
+
+  const stored = window.localStorage.getItem(LOCALE_STORAGE_KEY);
+  if (stored === "ko" || stored === "en") {
+    return stored;
+  }
+
+  const pathLocale = window.location.pathname.split("/")[1];
+  if (pathLocale === "ko" || pathLocale === "en") {
+    return pathLocale;
+  }
+
+  const browserLang = window.navigator.language.toLowerCase();
+  return browserLang.startsWith("ko") ? "ko" : "en";
+}
+
+function LanguageSelector() {
+  const [locale, setLocale] = useState<Locale>(resolveLocale());
+
+  const handleChange = (next: Locale) => {
+    if (next === locale) {
+      return;
+    }
+    window.localStorage.setItem(LOCALE_STORAGE_KEY, next);
+    setLocale(next);
+    window.location.reload();
+  };
+
+  return (
+    <select
+      value={locale}
+      onChange={(event) => handleChange(event.target.value as Locale)}
+      className="rounded-full border border-border bg-transparent px-3 py-2 text-sm text-muted-foreground transition hover:bg-muted/20"
+      aria-label={t("ui.common.language", "언어")}
+    >
+      <option value="ko">
+        {t("ui.common.language_ko", "한국어")}
+      </option>
+      <option value="en">
+        {t("ui.common.language_en", "English")}
+      </option>
+    </select>
+  );
+}
+
+export default LanguageSelector;
diff --git a/adminfront/src/components/layout/AppLayout.tsx b/adminfront/src/components/layout/AppLayout.tsx
index c9ece4f8..14f68839 100644
--- a/adminfront/src/components/layout/AppLayout.tsx
+++ b/adminfront/src/components/layout/AppLayout.tsx
@@ -13,6 +13,7 @@ import {
 import { useEffect, useState } from "react";
 import { NavLink, Outlet } from "react-router-dom";
 import { t } from "../../lib/i18n";
+import LanguageSelector from "../common/LanguageSelector";
 import RoleSwitcher from "./RoleSwitcher";
 
 const navItems = [
@@ -132,6 +133,7 @@ function AppLayout() {
               </span>
             </div>
             <div className="flex items-center gap-2 text-sm">
+              <LanguageSelector />
               <button
                 type="button"
                 onClick={toggleTheme}
diff --git a/backend/internal/handler/auth_handler.go b/backend/internal/handler/auth_handler.go
index 5bc2dc16..e5127d03 100644
--- a/backend/internal/handler/auth_handler.go
+++ b/backend/internal/handler/auth_handler.go
@@ -454,7 +454,8 @@ func (h *AuthHandler) Signup(c *fiber.Ctx) error {
 
 	slog.Info("[Signup] New user registered", "email", req.Email, "type", req.AffiliationType, "provider", h.IdpProvider.Name(), "subject", providerID)
 
-	// [New] Local DB Sync
+	// [SoT Policy] Kratos가 SoT이므로 로컬 DB 저장은 비동기 Read-Model 동기화로 처리합니다.
+	// 로컬 DB 저장이 실패하더라도 회원가입 프로세스는 성공으로 간주합니다.
 	localUser := &domain.User{
 		ID:              providerID, // Match IDP Subject
 		Email:           req.Email,
@@ -470,9 +471,17 @@ func (h *AuthHandler) Signup(c *fiber.Ctx) error {
 	}
 
 	if h.UserRepo != nil {
-		if err := h.UserRepo.Create(c.Context(), localUser); err != nil {
-			slog.Error("[Signup] Failed to sync user to local DB", "email", req.Email, "error", err)
-		}
+		go func(u *domain.User) {
+			// 요청 Context가 취소될 수 있으므로 Background Context 사용
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+
+			if err := h.UserRepo.Create(ctx, u); err != nil {
+				slog.Error("[Signup] Failed to sync user to Read-Model (Local DB)", "email", u.Email, "error", err)
+			} else {
+				slog.Debug("[Signup] Synced user to Read-Model", "email", u.Email)
+			}
+		}(localUser)
 	}
 
 	// [Keto] Sync user-tenant relationship
diff --git a/backend/internal/handler/auth_handler_async_test.go b/backend/internal/handler/auth_handler_async_test.go
new file mode 100644
index 00000000..48db4a75
--- /dev/null
+++ b/backend/internal/handler/auth_handler_async_test.go
@@ -0,0 +1,251 @@
+package handler
+
+import (
+	"baron-sso-backend/internal/domain"
+	"baron-sso-backend/internal/service"
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+// --- Async Test Mocks ---
+
+type AsyncMockIdpProvider struct {
+	mock.Mock
+}
+
+func (m *AsyncMockIdpProvider) Name() string { return "mock-idp" }
+func (m *AsyncMockIdpProvider) GetMetadata() (*domain.IDPMetadata, error) {
+	return &domain.IDPMetadata{}, nil
+}
+func (m *AsyncMockIdpProvider) UserExists(loginID string) (bool, error) {
+	args := m.Called(loginID)
+	return args.Bool(0), args.Error(1)
+}
+func (m *AsyncMockIdpProvider) CreateUser(user *domain.BrokerUser, password string) (string, error) {
+	args := m.Called(user, password)
+	return args.String(0), args.Error(1)
+}
+func (m *AsyncMockIdpProvider) SignIn(loginID, password string) (*domain.AuthInfo, error) {
+	return nil, nil
+}
+func (m *AsyncMockIdpProvider) IssueSession(loginID string) (*domain.AuthInfo, error) { return nil, nil }
+func (m *AsyncMockIdpProvider) InitiateLinkLogin(loginID, returnTo string) (*domain.LinkLoginInit, error) {
+	return nil, nil
+}
+func (m *AsyncMockIdpProvider) VerifyLoginCode(loginID, flowID, code string) (*domain.AuthInfo, error) {
+	return nil, nil
+}
+func (m *AsyncMockIdpProvider) GetPasswordPolicy() (*domain.PasswordPolicy, error) {
+	return &domain.PasswordPolicy{MinLength: 12}, nil
+}
+func (m *AsyncMockIdpProvider) InitiatePasswordReset(loginID, redirectUrl string) error { return nil }
+func (m *AsyncMockIdpProvider) VerifyPasswordResetToken(token string) (*domain.AuthInfo, error) {
+	return nil, nil
+}
+func (m *AsyncMockIdpProvider) UpdateUserPassword(loginID, newPassword string, r *http.Request) error {
+	return nil
+}
+
+type AsyncMockUserRepo struct {
+	mock.Mock
+	createCalled chan bool
+}
+
+func (m *AsyncMockUserRepo) Create(ctx context.Context, user *domain.User) error {
+	// Simulate DB latency
+	time.Sleep(50 * time.Millisecond)
+	args := m.Called(ctx, user)
+	if m.createCalled != nil {
+		m.createCalled <- true
+	}
+	return args.Error(0)
+}
+func (m *AsyncMockUserRepo) Update(ctx context.Context, user *domain.User) error { return nil }
+func (m *AsyncMockUserRepo) FindByEmail(ctx context.Context, email string) (*domain.User, error) {
+	return nil, nil
+}
+func (m *AsyncMockUserRepo) FindByID(ctx context.Context, id string) (*domain.User, error) {
+	return nil, nil
+}
+func (m *AsyncMockUserRepo) FindByIDs(ctx context.Context, ids []string) ([]domain.User, error) {
+	return nil, nil
+}
+func (m *AsyncMockUserRepo) ListByTenant(ctx context.Context, tenantID string) ([]domain.User, error) {
+	return nil, nil
+}
+func (m *AsyncMockUserRepo) List(ctx context.Context, offset, limit int, search string) ([]domain.User, int64, error) {
+	return nil, 0, nil
+}
+
+type AsyncMockRedisRepo struct {
+	mock.Mock
+}
+
+func (m *AsyncMockRedisRepo) Set(key string, value string, expiration time.Duration) error {
+	args := m.Called(key, value, expiration)
+	return args.Error(0)
+}
+func (m *AsyncMockRedisRepo) Get(key string) (string, error) {
+	args := m.Called(key)
+	return args.String(0), args.Error(1)
+}
+func (m *AsyncMockRedisRepo) Delete(key string) error {
+	args := m.Called(key)
+	return args.Error(0)
+}
+func (m *AsyncMockRedisRepo) StoreVerificationCode(phone, code string) error   { return nil }
+func (m *AsyncMockRedisRepo) GetVerificationCode(phone string) (string, error) { return "", nil }
+func (m *AsyncMockRedisRepo) DeleteVerificationCode(phone string) error        { return nil }
+
+type AsyncMockTenantService struct {
+	mock.Mock
+}
+
+func (m *AsyncMockTenantService) RegisterTenant(ctx context.Context, name, slug, description string, domains []string) (*domain.Tenant, error) {
+	return nil, nil
+}
+func (m *AsyncMockTenantService) RequestRegistration(ctx context.Context, name, slug, description string, domainName string, adminEmail string) (*domain.Tenant, error) {
+	return nil, nil
+}
+func (m *AsyncMockTenantService) GetTenantByDomain(ctx context.Context, emailDomain string) (*domain.Tenant, error) {
+	args := m.Called(ctx, emailDomain)
+	if args.Get(0) == nil {
+		return nil, args.Error(1)
+	}
+	return args.Get(0).(*domain.Tenant), args.Error(1)
+}
+func (m *AsyncMockTenantService) GetTenantBySlug(ctx context.Context, slug string) (*domain.Tenant, error) {
+	return nil, nil
+}
+func (m *AsyncMockTenantService) GetTenant(ctx context.Context, id string) (*domain.Tenant, error) {
+	return nil, nil
+}
+func (m *AsyncMockTenantService) ListManageableTenants(ctx context.Context, userID string) ([]domain.Tenant, error) {
+	return nil, nil
+}
+func (m *AsyncMockTenantService) ApproveTenant(ctx context.Context, id string) error { return nil }
+func (m *AsyncMockTenantService) SetKetoService(keto service.KetoService)           {}
+func (m *AsyncMockTenantService) AddTenantAdmin(ctx context.Context, tenantID, userID string) error {
+	return nil
+}
+func (m *AsyncMockTenantService) RemoveTenantAdmin(ctx context.Context, tenantID, userID string) error {
+	return nil
+}
+func (m *AsyncMockTenantService) ListTenantAdmins(ctx context.Context, tenantID string) ([]string, error) {
+	return nil, nil
+}
+
+type AsyncMockKetoService struct {
+	mock.Mock
+}
+
+func (m *AsyncMockKetoService) CreateRelation(ctx context.Context, namespace, object, relation, subject string) error {
+	args := m.Called(ctx, namespace, object, relation, subject)
+	return args.Error(0)
+}
+func (m *AsyncMockKetoService) DeleteRelation(ctx context.Context, namespace, object, relation, subject string) error {
+	return nil
+}
+func (m *AsyncMockKetoService) CheckPermission(ctx context.Context, namespace, object, relation, subject string) (bool, error) {
+	return false, nil
+}
+func (m *AsyncMockKetoService) ListObjects(ctx context.Context, namespace, relation, subject string) ([]string, error) {
+	return nil, nil
+}
+func (m *AsyncMockKetoService) ListRelations(ctx context.Context, namespace, object, relation, subject string) ([]service.RelationTuple, error) {
+	return nil, nil
+}
+
+// --- Tests ---
+
+func TestSignup_AsyncDB_Isolation(t *testing.T) {
+	mockIdp := new(AsyncMockIdpProvider)
+	mockUserRepo := new(AsyncMockUserRepo)
+	mockRedis := new(AsyncMockRedisRepo)
+	mockTenant := new(AsyncMockTenantService)
+	mockKeto := new(AsyncMockKetoService)
+
+	h := &AuthHandler{
+		IdpProvider:   mockIdp,
+		UserRepo:      mockUserRepo,
+		RedisService:  mockRedis,
+		TenantService: mockTenant,
+		KetoService:   mockKeto,
+	}
+
+	app := fiber.New()
+	app.Post("/signup", h.Signup)
+
+	t.Run("SoT_DB_Failure_Ignored_And_Async", func(t *testing.T) {
+		email := "test@example.com"
+		phone := "010-1234-5678"
+		emailKey := "signup:email:" + email
+		phoneKey := "signup:phone:" + "01012345678"
+
+		// Redis Mocks
+		mockRedis.On("Get", emailKey).Return(`{"verified": true, "expires_at": 9999999999}`, nil)
+		mockRedis.On("Get", phoneKey).Return(`{"verified": true, "expires_at": 9999999999}`, nil)
+		mockRedis.On("Delete", emailKey).Return(nil)
+		mockRedis.On("Delete", phoneKey).Return(nil)
+
+		// Tenant Mocks
+		mockTenant.On("GetTenantByDomain", mock.Anything, "example.com").Return(nil, errors.New("not found"))
+
+		// Kratos Mocks (Success)
+		mockIdp.On("CreateUser", mock.Anything, "Password123!").Return("new-user-uuid", nil)
+
+		// UserRepo Mocks (Async & Failure)
+		mockUserRepo.createCalled = make(chan bool, 1)
+		mockUserRepo.On("Create", mock.Anything, mock.MatchedBy(func(u *domain.User) bool {
+			return u.Email == email
+		})).Return(errors.New("db connection error"))
+
+		// Keto Mocks (Optional, since it's also async)
+		// We won't block on this either
+
+		body, _ := json.Marshal(domain.SignupRequest{
+			Email:         email,
+			Password:      "Password123!",
+			Name:          "Test User",
+			Phone:         phone,
+			TermsAccepted: true,
+		})
+		req := httptest.NewRequest("POST", "/signup", bytes.NewReader(body))
+		req.Header.Set("Content-Type", "application/json")
+
+		start := time.Now()
+		resp, err := app.Test(req, 5000)
+		elapsed := time.Since(start)
+
+		if err != nil {
+			t.Fatalf("Request failed: %v", err)
+		}
+
+		assert.Equal(t, 200, resp.StatusCode)
+
+		// Ensure API responded faster than DB latency (50ms)
+		assert.Less(t, int64(elapsed), int64(60*time.Millisecond), "API should return before DB timeout")
+
+		// Wait for async execution
+		select {
+		case <-mockUserRepo.createCalled:
+			// Pass
+		case <-time.After(2 * time.Second):
+			t.Fatal("UserRepo.Create was not called asynchronously")
+		}
+
+		mockRedis.AssertExpectations(t)
+		mockIdp.AssertExpectations(t)
+		mockUserRepo.AssertExpectations(t)
+	})
+}
diff --git a/backend/internal/handler/user_handler.go b/backend/internal/handler/user_handler.go
index 966e5b82..00a64ba7 100644
--- a/backend/internal/handler/user_handler.go
+++ b/backend/internal/handler/user_handler.go
@@ -304,10 +304,15 @@ func (h *UserHandler) CreateUser(c *fiber.Ctx) error {
 		localUser.TenantID = &tenantID
 	}
 
+	// [SoT Policy] Kratos가 SoT이므로 로컬 DB 저장은 비동기 Read-Model 동기화로 처리합니다.
 	if h.UserRepo != nil {
-		if err := h.UserRepo.Create(c.Context(), localUser); err != nil {
-			slog.Error("[UserHandler] Failed to sync user to local DB", "email", email, "error", err)
-		}
+		go func(u *domain.User) {
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			if err := h.UserRepo.Create(ctx, u); err != nil {
+				slog.Error("[UserHandler] Failed to sync user to local DB", "email", u.Email, "error", err)
+			}
+		}(localUser)
 	}
 
 	// [Keto] Sync relations
@@ -483,27 +488,32 @@ func (h *UserHandler) UpdateUser(c *fiber.Ctx) error {
 				localUser.Metadata = req.Metadata
 			}
 
-			if err := h.UserRepo.Update(c.Context(), localUser); err == nil {
-				// [Keto Sync on Role Change]
-				if h.KetoService != nil && req.Role != nil && *req.Role != oldRole {
-					go func(uID, oldR, newR, tID string) {
-						ctx := context.Background()
-						if oldR == domain.RoleSuperAdmin {
+			// [SoT Policy] Kratos가 SoT이므로 로컬 DB 저장은 비동기 Read-Model 동기화로 처리합니다.
+			go func(u *domain.User, rRole *string, oRole string, oTenantID string) {
+				ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+				defer cancel()
+
+				if err := h.UserRepo.Update(ctx, u); err == nil {
+					// [Keto Sync on Role Change]
+					if h.KetoService != nil && rRole != nil && *rRole != oRole {
+						uID := u.ID
+						newR := *rRole
+						if oRole == domain.RoleSuperAdmin {
 							_ = h.KetoService.DeleteRelation(ctx, "System", "global", "super_admins", uID)
-						} else if oldR == domain.RoleTenantAdmin && tID != "" {
-							_ = h.KetoService.DeleteRelation(ctx, "Tenant", tID, "admins", uID)
+						} else if oRole == domain.RoleTenantAdmin && oTenantID != "" {
+							_ = h.KetoService.DeleteRelation(ctx, "Tenant", oTenantID, "admins", uID)
 						}
 
 						if newR == domain.RoleSuperAdmin {
 							_ = h.KetoService.CreateRelation(ctx, "System", "global", "super_admins", uID)
-						} else if newR == domain.RoleTenantAdmin && tID != "" {
-							_ = h.KetoService.CreateRelation(ctx, "Tenant", tID, "admins", uID)
+						} else if newR == domain.RoleTenantAdmin && u.TenantID != nil {
+							_ = h.KetoService.CreateRelation(ctx, "Tenant", *u.TenantID, "admins", uID)
 						}
-					}(userID, oldRole, *req.Role, oldTenantID)
+					}
+				} else {
+					slog.Error("[UserHandler] Failed to sync user update to local DB", "userID", u.ID, "error", err)
 				}
-			} else {
-				slog.Error("[UserHandler] Failed to sync user update to local DB", "userID", userID, "error", err)
-			}
+			}(localUser, req.Role, oldRole, oldTenantID)
 		}
 	}
 
diff --git a/devfront/src/components/common/LanguageSelector.tsx b/devfront/src/components/common/LanguageSelector.tsx
new file mode 100644
index 00000000..fe77df72
--- /dev/null
+++ b/devfront/src/components/common/LanguageSelector.tsx
@@ -0,0 +1,57 @@
+import { useState } from "react";
+import { t } from "../../lib/i18n";
+
+const LOCALE_STORAGE_KEY = "locale";
+const SUPPORTED_LOCALES = ["ko", "en"] as const;
+
+type Locale = (typeof SUPPORTED_LOCALES)[number];
+
+function resolveLocale(): Locale {
+  if (typeof window === "undefined") {
+    return "ko";
+  }
+
+  const stored = window.localStorage.getItem(LOCALE_STORAGE_KEY);
+  if (stored === "ko" || stored === "en") {
+    return stored;
+  }
+
+  const pathLocale = window.location.pathname.split("/")[1];
+  if (pathLocale === "ko" || pathLocale === "en") {
+    return pathLocale;
+  }
+
+  const browserLang = window.navigator.language.toLowerCase();
+  return browserLang.startsWith("ko") ? "ko" : "en";
+}
+
+function LanguageSelector() {
+  const [locale, setLocale] = useState<Locale>(resolveLocale());
+
+  const handleChange = (next: Locale) => {
+    if (next === locale) {
+      return;
+    }
+    window.localStorage.setItem(LOCALE_STORAGE_KEY, next);
+    setLocale(next);
+    window.location.reload();
+  };
+
+  return (
+    <select
+      value={locale}
+      onChange={(event) => handleChange(event.target.value as Locale)}
+      className="rounded-full border border-border bg-transparent px-3 py-2 text-sm text-muted-foreground transition hover:bg-muted/20"
+      aria-label={t("ui.common.language", "언어")}
+    >
+      <option value="ko">
+        {t("ui.common.language_ko", "한국어")}
+      </option>
+      <option value="en">
+        {t("ui.common.language_en", "English")}
+      </option>
+    </select>
+  );
+}
+
+export default LanguageSelector;
diff --git a/devfront/src/components/layout/AppLayout.tsx b/devfront/src/components/layout/AppLayout.tsx
index c3a2d809..32ee17e9 100644
--- a/devfront/src/components/layout/AppLayout.tsx
+++ b/devfront/src/components/layout/AppLayout.tsx
@@ -2,6 +2,7 @@ import { BadgeCheck, Moon, ShieldHalf, Sun } from "lucide-react";
 import { useEffect, useState } from "react";
 import { NavLink, Outlet } from "react-router-dom";
 import { t } from "../../lib/i18n";
+import LanguageSelector from "../common/LanguageSelector";
 import { Toaster } from "../ui/toaster";
 
 const navItems = [
@@ -105,6 +106,7 @@ function AppLayout() {
               </span>
             </div>
             <div className="flex items-center gap-2 text-sm">
+              <LanguageSelector />
               <button
                 type="button"
                 onClick={toggleTheme}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a96bb77a..8e044d7f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,8 +11,8 @@ services:
             - GO_ENV=${APP_ENV:-development}
             - COOKIE_SECRET=${COOKIE_SECRET}
             - JWT_SECRET=${JWT_SECRET}
-            - DESCOPE_PROJECT_ID=${DESCOPE_PROJECT_ID}
-            - DESCOPE_MANAGEMENT_KEY=${DESCOPE_MANAGEMENT_KEY}
+            - DESCOPE_PROJECT_ID=${DESCOPE_PROJECT_ID:-}
+            - DESCOPE_MANAGEMENT_KEY=${DESCOPE_MANAGEMENT_KEY:-}
             - NAVER_CLOUD_ACCESS_KEY=${NAVER_CLOUD_ACCESS_KEY}
             - NAVER_CLOUD_SECRET_KEY=${NAVER_CLOUD_SECRET_KEY}
             - NAVER_CLOUD_SERVICE_ID=${NAVER_CLOUD_SERVICE_ID}
@@ -82,13 +82,13 @@ services:
 
     userfront:
         build:
-            context: ./userfront
-            dockerfile: Dockerfile
+            context: .
+            dockerfile: userfront/Dockerfile
         container_name: baron_userfront
         env_file:
             - .env
         environment:
-            - BACKEND_URL=${BACKEND_URL}
+            - BACKEND_URL=${BACKEND_URL:-}
             - USERFRONT_URL=${USERFRONT_URL}
             - APP_ENV=${APP_ENV}
         networks:
diff --git a/docker/compose.ory.yaml b/docker/compose.ory.yaml
index 7b58b802..5f18ca75 100644
--- a/docker/compose.ory.yaml
+++ b/docker/compose.ory.yaml
@@ -1,135 +1,136 @@
 services:
-  postgres_ory:
-    image: postgres:${ORY_POSTGRES_TAG:-17-alpine}
-    container_name: ory_postgres
-    environment:
-      - POSTGRES_USER=${ORY_POSTGRES_USER:-ory}
-      - POSTGRES_PASSWORD=${ORY_POSTGRES_PASSWORD:-secret}
-      - POSTGRES_DB=${ORY_POSTGRES_DB:-ory}
-    volumes:
-      - ./docker/ory/init-db:/docker-entrypoint-initdb.d
-      - ory_postgres_data:/var/lib/postgresql/data
-    networks:
-      - ory-net
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -U ${ORY_POSTGRES_USER:-ory} -d ${KRATOS_DB:-ory_kratos}",
-        ]
-      interval: 5s
-      timeout: 5s
-      retries: 5
+    postgres_ory:
+        image: postgres:${ORY_POSTGRES_TAG:-17-alpine}
+        container_name: ory_postgres
+        environment:
+            - POSTGRES_USER=${ORY_POSTGRES_USER:-ory}
+            - POSTGRES_PASSWORD=${ORY_POSTGRES_PASSWORD:-secret}
+            - POSTGRES_DB=${ORY_POSTGRES_DB:-ory}
+        volumes:
+            - ./docker/ory/init-db:/docker-entrypoint-initdb.d
+            - ory_postgres_data:/var/lib/postgresql/data
+        networks:
+            - ory-net
+        healthcheck:
+            test:
+                [
+                    "CMD-SHELL",
+                    "pg_isready -U ${ORY_POSTGRES_USER:-ory} -d ${KRATOS_DB:-ory_kratos}",
+                ]
+            interval: 5s
+            timeout: 5s
+            retries: 5
 
-  kratos-migrate:
-    image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
-    environment:
-      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
-      - KRATOS_SERVE_PUBLIC_BASE_URL="${KRATOS_BROWSER_URL:-http://localhost:4433}"
-      - KRATOS_SERVE_ADMIN_BASE_URL="${KRATOS_ADMIN_URL:-http://kratos:4434}"
-      - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL="${KRATOS_UI_URL:-http://localhost:5000}"
-      - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS='["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]'
-    volumes:
-      - ./docker/ory/kratos:/etc/config/kratos
-    command: migrate sql up -e -c /etc/config/kratos/kratos.yml --yes
-    depends_on:
-      postgres_ory:
-        condition: service_healthy
-    networks:
-      - ory-net
+    kratos-migrate:
+        image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
+        environment:
+            - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
+            - KRATOS_SERVE_PUBLIC_BASE_URL="${KRATOS_BROWSER_URL:-http://localhost:4433}"
+            - KRATOS_SERVE_ADMIN_BASE_URL="${KRATOS_ADMIN_URL:-http://kratos:4434}"
+            - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL="${KRATOS_UI_URL:-http://localhost:5000}"
+            - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS='["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]'
+        volumes:
+            - ./docker/ory/kratos:/etc/config/kratos
+        command: migrate sql up -e -c /etc/config/kratos/kratos.yml --yes
+        depends_on:
+            postgres_ory:
+                condition: service_healthy
+        networks:
+            - ory-net
 
-  kratos:
-    image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
-    container_name: ory_kratos
-    environment:
-      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
-      - COOKIE_SECRET="${COOKIE_SECRET:-localcookie123}"
-      - KRATOS_SERVE_PUBLIC_BASE_URL="${KRATOS_BROWSER_URL:-http://localhost:4433}"
-      - KRATOS_SERVE_ADMIN_BASE_URL="${KRATOS_ADMIN_URL:-http://kratos:4434}"
-      - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL="${KRATOS_UI_URL:-http://localhost:5000}"
-      - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS='["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]'
-    volumes:
-      - ./docker/ory/kratos:/etc/config/kratos
-    command: serve -c /etc/config/kratos/kratos.yml
-    depends_on:
-      kratos-migrate:
-        condition: service_completed_successfully
-    networks:
-      - ory-net
-      - kratosnet
+    kratos:
+        image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
+        container_name: ory_kratos
+        environment:
+            - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
+            - COOKIE_SECRET="${COOKIE_SECRET:-localcookie123}"
+            - KRATOS_SERVE_PUBLIC_BASE_URL="${KRATOS_BROWSER_URL:-http://localhost:4433}"
+            - KRATOS_SERVE_ADMIN_BASE_URL="${KRATOS_ADMIN_URL:-http://kratos:4434}"
+            - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL="${KRATOS_UI_URL:-http://localhost:5000}"
+            - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS='["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]'
+        volumes:
+            - ./docker/ory/kratos:/etc/config/kratos
+        command: serve -c /etc/config/kratos/kratos.yml
+        depends_on:
+            kratos-migrate:
+                condition: service_completed_successfully
+        networks:
+            - ory-net
+            - kratosnet
 
-  hydra-migrate:
-    image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
-    environment:
-      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
-    command: migrate sql up -e --yes
-    depends_on:
-      postgres_ory:
-        condition: service_healthy
-    networks:
-      - ory-net
+    hydra-migrate:
+        image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
+        environment:
+            - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
+        command: migrate sql up -e --yes
+        depends_on:
+            postgres_ory:
+                condition: service_healthy
+        networks:
+            - ory-net
 
-  hydra:
-    image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
-    container_name: ory_hydra
-    environment:
-      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
-      - URLS_SELF_ISSUER=${USERFRONT_URL:-http://localhost:5000}/oidc
-      - URLS_LOGIN=${USERFRONT_URL:-http://localhost:5000}/login
-      - URLS_CONSENT=${USERFRONT_URL:-http://localhost:5000}/consent
-      - SECRETS_SYSTEM=${ORY_POSTGRES_PASSWORD}
-    volumes:
-      - ./docker/ory/hydra:/etc/config/hydra
-    command: serve -c /etc/config/hydra/hydra.yml all --dev
-    depends_on:
-      hydra-migrate:
-        condition: service_completed_successfully
-    networks:
-      - ory-net
-      - hydranet
+    hydra:
+        image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
+        container_name: ory_hydra
+        environment:
+            - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
+            - URLS_SELF_ISSUER=${USERFRONT_URL:-http://localhost:5000}/oidc
+            - URLS_LOGIN=${USERFRONT_URL:-http://localhost:5000}/login
+            - URLS_CONSENT=${USERFRONT_URL:-http://localhost:5000}/consent
+            - SECRETS_SYSTEM=${ORY_POSTGRES_PASSWORD}
+        volumes:
+            - ./docker/ory/hydra:/etc/config/hydra
+        command: serve -c /etc/config/hydra/hydra.yml all --dev
+        depends_on:
+            hydra-migrate:
+                condition: service_completed_successfully
+        networks:
+            - ory-net
+            - hydranet
 
-  # [수정됨] Oathkeeper 서비스 추가 (Backend 연결 문제 해결)
-  oathkeeper:
-    image: oryd/oathkeeper:${OATHKEEPER_VERSION:-v0.40.6}
-    container_name: oathkeeper
-    restart: unless-stopped
-    depends_on:
-      kratos:
-        condition: service_started
-    environment:
-      - LOG_LEVEL=debug
-    command: serve proxy --config /etc/config/oathkeeper/oathkeeper.yml
-    volumes:
-      - ./docker/ory/oathkeeper:/etc/config/oathkeeper
-    networks:
-      - ory-net
-      - baron_net  # Backend가 통신하기 위해 필수
-      - public_net
-    ports:
-      - "4455:4455" # Proxy
-      - "4456:4456" # API (Backend 헬스체크용)
-    healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:4456/health/ready"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
+    # [수정됨] Oathkeeper 서비스 추가 (Backend 연결 문제 해결)
+    oathkeeper:
+        image: oryd/oathkeeper:${OATHKEEPER_VERSION:-v0.40.6}
+        container_name: oathkeeper
+        restart: unless-stopped
+        depends_on:
+            kratos:
+                condition: service_started
+        environment:
+            - LOG_LEVEL=debug
+        command: serve proxy --config /etc/config/oathkeeper/oathkeeper.yml
+        volumes:
+            - ./docker/ory/oathkeeper:/etc/config/oathkeeper
+            - oathkeeper_logs:/var/log/oathkeeper
+        networks:
+            - ory-net
+            - baron_net # Backend가 통신하기 위해 필수
+            - public_net
+        ports:
+            - "4455:4455" # Proxy
+            - "4456:4456" # API (Backend 헬스체크용)
+        healthcheck:
+            test: ["CMD", "wget", "-qO-", "http://127.0.0.1:4456/health/ready"]
+            interval: 5s
+            timeout: 5s
+            retries: 5
 volumes:
-  ory_postgres_data:
+    ory_postgres_data:
 
 networks:
-  ory-net:
-    external: true
-    name: ory-net
-  hydranet:
-    external: true
-    name: hydranet
-  kratosnet:
-    external: true
-    name: kratosnet
-  public_net:
-    external: true
-    name: public_net
-  # [수정됨] Baron Net 추가 정의 (Oathkeeper 연결용)
-  baron_net:
-    external: true
-    name: baron_net
\ No newline at end of file
+    ory-net:
+        external: true
+        name: ory-net
+    hydranet:
+        external: true
+        name: hydranet
+    kratosnet:
+        external: true
+        name: kratosnet
+    public_net:
+        external: true
+        name: public_net
+    # [수정됨] Baron Net 추가 정의 (Oathkeeper 연결용)
+    baron_net:
+        external: true
+        name: baron_net
diff --git a/docker/docker-compose.staging.template.yaml b/docker/docker-compose.staging.template.yaml
index e23578c5..b1d0558d 100644
--- a/docker/docker-compose.staging.template.yaml
+++ b/docker/docker-compose.staging.template.yaml
@@ -64,7 +64,7 @@ services:
     env_file:
       - .env
     environment:
-      - BACKEND_URL=${BACKEND_URL}
+      - BACKEND_URL=${BACKEND_URL:-}
       - USERFRONT_URL=${USERFRONT_URL}
       - APP_ENV=stage
     networks:
@@ -75,7 +75,7 @@ services:
         condition: service_healthy
     command: >
       /bin/sh -c "mkdir -p /usr/share/nginx/html/assets &&
-                  echo \"BACKEND_URL=${BACKEND_URL}\" >> /usr/share/nginx/html/assets/.env &&
+                  echo \"BACKEND_URL=${BACKEND_URL:-}\" >> /usr/share/nginx/html/assets/.env &&
                   echo \"USERFRONT_URL=${USERFRONT_URL}\" >> /usr/share/nginx/html/assets/.env &&
                   echo \"APP_ENV=stage\" >> /usr/share/nginx/html/assets/.env &&
                   cp /usr/share/nginx/html/assets/.env /usr/share/nginx/html/.env &&
diff --git a/docker/ory/kratos/kratos.yml b/docker/ory/kratos/kratos.yml
index 9775e2bb..dbc8e2b0 100644
--- a/docker/ory/kratos/kratos.yml
+++ b/docker/ory/kratos/kratos.yml
@@ -1,4 +1,4 @@
-version: v1.3.0
+version: v25.4.0
 
 dsn: ${DSN}
 
@@ -7,19 +7,26 @@ serve:
         base_url: http://localhost:4433/
         cors:
             enabled: true
+            allowed_origins:
+                - http://backend:3000
+                - http://baron_backend:3000
     admin:
         base_url: http://localhost:4434/
 
 selfservice:
     default_browser_return_url: http://localhost:5000/
     allowed_return_urls:
+        - http://baron_backend:3000
+        - http://baron_backend:3000/
         - http://localhost:5000
+        - https://app.brsw.kr
+        - https://app.brsw.kr/
         - https://sss.hmac.kr
         - https://sss.hmac.kr/
         - https://sso.hmac.kr
         - https://sso.hmac.kr/
-        - https://app.hmac.kr
-        - https://app.hmac.kr/
+        - https://ssologin.hmac.kr
+        - https://ssologin.hmac.kr/
 
     methods:
         password:
diff --git a/docker/ory/oathkeeper/entrypoint.sh b/docker/ory/oathkeeper/entrypoint.sh
index fe15ce6a..d3736b85 100755
--- a/docker/ory/oathkeeper/entrypoint.sh
+++ b/docker/ory/oathkeeper/entrypoint.sh
@@ -37,7 +37,11 @@ mkdir -p "$LOG_DIR"
 if ! touch "$LOG_FILE" 2>/dev/null; then
   echo "[oathkeeper] log file not writable: $LOG_FILE"
   ls -ld "$LOG_DIR" || true
-  exit 1
+  LOG_FILE=""
 fi
 
-exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml 2>&1 | tee \"$LOG_FILE\""
+if [ -n "$LOG_FILE" ]; then
+  exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml 2>&1 | tee \"$LOG_FILE\""
+fi
+
+exec /bin/sh -c "oathkeeper serve proxy -c /etc/config/oathkeeper/oathkeeper.yml"
diff --git a/docker/staging_pull_compose.template.yaml b/docker/staging_pull_compose.template.yaml
new file mode 100644
index 00000000..8c2e5268
--- /dev/null
+++ b/docker/staging_pull_compose.template.yaml
@@ -0,0 +1,400 @@
+services:
+  postgres:
+    image: postgres:17-alpine
+    container_name: baron_postgres
+    environment:
+      POSTGRES_USER: "${DB_USER:-baron}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD:-password}"
+      POSTGRES_DB: "${DB_NAME:-baron_sso}"
+    ports:
+      - "${DB_PORT:-5432}:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./docker/init-metadata:/docker-entrypoint-initdb.d
+    networks:
+      - baron_net
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${DB_USER:-baron} -d ${DB_NAME:-baron_sso}",
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    restart: always
+
+  clickhouse:
+    image: clickhouse/clickhouse-server:latest
+    container_name: baron_clickhouse
+    restart: always
+    volumes:
+      - clickhouse_data:/var/lib/clickhouse
+    environment:
+      CLICKHOUSE_USER: "${CLICKHOUSE_USER:-baron}"
+      CLICKHOUSE_PASSWORD: "${CLICKHOUSE_PASSWORD:-password}"
+    networks:
+      - baron_net
+    healthcheck:
+      test: ["CMD", "clickhouse-client", "--query", "SELECT 1"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  redis:
+    image: redis:7-alpine
+    container_name: baron_redis
+    restart: always
+    command: redis-server --port 6389
+    ports:
+      - "6389:6389"
+    volumes:
+      - redis_data:/data
+    networks:
+      - baron_net
+    healthcheck:
+      test: ["CMD", "redis-cli", "-p", "6389", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  gateway:
+    image: nginx:alpine
+    container_name: baron_gateway
+    restart: always
+    ports:
+      - "${USERFRONT_PORT:-5000}:5000"
+    volumes:
+      - ./gateway/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+    networks:
+      - baron_net
+      - public_net
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:5000/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
+  postgres_ory:
+    image: postgres:${ORY_POSTGRES_TAG:-17-alpine}
+    container_name: ory_postgres
+    environment:
+      - POSTGRES_USER=${ORY_POSTGRES_USER:-ory}
+      - POSTGRES_PASSWORD=${ORY_POSTGRES_PASSWORD:-secret}
+      - POSTGRES_DB=${ORY_POSTGRES_DB:-ory}
+    volumes:
+      - ./docker/ory/init-db:/docker-entrypoint-initdb.d
+      - ory_postgres_data:/var/lib/postgresql/data
+    networks:
+      - ory-net
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${ORY_POSTGRES_USER:-ory} -d ${KRATOS_DB:-ory_kratos}",
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  kratos-migrate:
+    image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
+      - KRATOS_SERVE_PUBLIC_BASE_URL=${KRATOS_BROWSER_URL:-http://localhost:4433}
+      - KRATOS_SERVE_ADMIN_BASE_URL=${KRATOS_ADMIN_URL:-http://kratos:4434}
+      - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL=${KRATOS_UI_URL:-http://localhost:5000}
+      - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS=["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]
+      - KRATOS_SELFSERVICE_FLOWS_ERROR_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/error
+      - KRATOS_SELFSERVICE_FLOWS_SETTINGS_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/error?error=settings_disabled
+      - KRATOS_SELFSERVICE_FLOWS_RECOVERY_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/recovery
+      - KRATOS_SELFSERVICE_FLOWS_VERIFICATION_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/verification
+      - KRATOS_SELFSERVICE_FLOWS_LOGIN_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/login
+      - KRATOS_SELFSERVICE_FLOWS_REGISTRATION_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/registration
+      - KRATOS_SELFSERVICE_FLOWS_LOGOUT_AFTER_DEFAULT_BROWSER_RETURN_URL=${KRATOS_UI_URL:-http://localhost:5000}/login
+    volumes:
+      - ./docker/ory/kratos:/etc/config/kratos
+    command: migrate sql up -e -c /etc/config/kratos/kratos.yml --yes
+    depends_on:
+      postgres_ory:
+        condition: service_healthy
+    networks:
+      - ory-net
+
+  kratos:
+    image: oryd/kratos:${KRATOS_VERSION:-v25.4.0}
+    container_name: ory_kratos
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KRATOS_DB:-ory_kratos}?sslmode=disable&max_conns=20
+      - COOKIE_SECRET=${COOKIE_SECRET:-localcookie123}
+      - KRATOS_SERVE_PUBLIC_BASE_URL=${KRATOS_BROWSER_URL:-http://localhost:4433}
+      - KRATOS_SERVE_ADMIN_BASE_URL=${KRATOS_ADMIN_URL:-http://kratos:4434}
+      - KRATOS_SELFSERVICE_DEFAULT_BROWSER_RETURN_URL=${KRATOS_UI_URL:-http://localhost:5000}
+      - KRATOS_SELFSERVICE_ALLOWED_RETURN_URLS=["${KRATOS_UI_URL:-http://localhost:5000}","${USERFRONT_URL:-http://localhost:5000}"]
+      - KRATOS_SELFSERVICE_FLOWS_ERROR_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/error
+      - KRATOS_SELFSERVICE_FLOWS_SETTINGS_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/error?error=settings_disabled
+      - KRATOS_SELFSERVICE_FLOWS_RECOVERY_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/recovery
+      - KRATOS_SELFSERVICE_FLOWS_VERIFICATION_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/verification
+      - KRATOS_SELFSERVICE_FLOWS_LOGIN_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/login
+      - KRATOS_SELFSERVICE_FLOWS_REGISTRATION_UI_URL=${KRATOS_UI_URL:-http://localhost:5000}/registration
+      - KRATOS_SELFSERVICE_FLOWS_LOGOUT_AFTER_DEFAULT_BROWSER_RETURN_URL=${KRATOS_UI_URL:-http://localhost:5000}/login
+    volumes:
+      - ./docker/ory/kratos:/etc/config/kratos
+    command: serve -c /etc/config/kratos/kratos.yml --dev --watch-courier
+    depends_on:
+      kratos-migrate:
+        condition: service_completed_successfully
+    networks:
+      - ory-net
+      - kratosnet
+
+  hydra-migrate:
+    image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
+    command: migrate sql up -e --yes
+    depends_on:
+      postgres_ory:
+        condition: service_healthy
+    networks:
+      - ory-net
+
+  hydra:
+    image: oryd/hydra:${HYDRA_VERSION:-v25.4.0}
+    container_name: ory_hydra
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${HYDRA_DB:-ory_hydra}?sslmode=disable&max_conns=20
+      - URLS_SELF_ISSUER=${USERFRONT_URL:-http://localhost:5000}/oidc
+      - URLS_LOGIN=${USERFRONT_URL:-http://localhost:5000}/login
+      - URLS_CONSENT=${USERFRONT_URL:-http://localhost:5000}/consent
+      - SECRETS_SYSTEM=${ORY_POSTGRES_PASSWORD}
+    volumes:
+      - ./docker/ory/hydra:/etc/config/hydra
+    command: serve -c /etc/config/hydra/hydra.yml all --dev
+    depends_on:
+      hydra-migrate:
+        condition: service_completed_successfully
+    networks:
+      - ory-net
+      - hydranet
+
+  keto-migrate:
+    image: oryd/keto:${KETO_VERSION:-v25.4.0}
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KETO_DB:-ory_keto}?sslmode=disable&max_conns=20
+    volumes:
+      - ./docker/ory/keto:/etc/config/keto
+    command: ["migrate", "up", "-c", "/etc/config/keto/keto.yml", "--yes"]
+    depends_on:
+      postgres_ory:
+        condition: service_healthy
+    networks:
+      - ory-net
+
+  keto:
+    image: oryd/keto:${KETO_VERSION:-v25.4.0}
+    container_name: ory_keto
+    environment:
+      - DSN=postgres://${ORY_POSTGRES_USER}:${ORY_POSTGRES_PASSWORD}@postgres_ory:5432/${KETO_DB:-ory_keto}?sslmode=disable&max_conns=20
+    volumes:
+      - ./docker/ory/keto:/etc/config/keto
+    command: serve -c /etc/config/keto/keto.yml
+    depends_on:
+      keto-migrate:
+        condition: service_completed_successfully
+    networks:
+      - ory-net
+
+  oathkeeper:
+    image: oryd/oathkeeper:${OATHKEEPER_VERSION:-v0.40.6}
+    container_name: oathkeeper
+    restart: unless-stopped
+    depends_on:
+      kratos:
+        condition: service_started
+    environment:
+      - LOG_LEVEL=debug
+    command: serve proxy --config /etc/config/oathkeeper/oathkeeper.yml
+    volumes:
+      - ./docker/ory/oathkeeper:/etc/config/oathkeeper
+      - oathkeeper_logs:/var/log/oathkeeper
+    networks:
+      - ory-net
+      - baron_net
+      - public_net
+    ports:
+      - "4455:4455"
+      - "4456:4456"
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:4456/health/ready"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  ory_clickhouse:
+    image: clickhouse/clickhouse-server:latest
+    container_name: ory_clickhouse
+    environment:
+      - CLICKHOUSE_USER=${ORY_CLICKHOUSE_USER:-ory}
+      - CLICKHOUSE_PASSWORD=${ORY_CLICKHOUSE_PASSWORD:-orypass}
+    volumes:
+      - ory_clickhouse_data:/var/lib/clickhouse
+      - ./docker/ory/clickhouse:/docker-entrypoint-initdb.d
+    networks:
+      - ory-net
+
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    container_name: baron_backend
+    env_file:
+      - .env
+    environment:
+      - APP_ENV=${APP_ENV:-development}
+      - GO_ENV=${APP_ENV:-development}
+      - COOKIE_SECRET=${COOKIE_SECRET}
+      - JWT_SECRET=${JWT_SECRET}
+      - DESCOPE_PROJECT_ID=${DESCOPE_PROJECT_ID:-}
+      - DESCOPE_MANAGEMENT_KEY=${DESCOPE_MANAGEMENT_KEY:-}
+      - NAVER_CLOUD_ACCESS_KEY=${NAVER_CLOUD_ACCESS_KEY}
+      - NAVER_CLOUD_SECRET_KEY=${NAVER_CLOUD_SECRET_KEY}
+      - NAVER_CLOUD_SERVICE_ID=${NAVER_CLOUD_SERVICE_ID}
+      - NAVER_SENDER_PHONE_NUMBER=${NAVER_SENDER_PHONE_NUMBER}
+      - USERFRONT_URL=${USERFRONT_URL}
+      - REDIS_ADDR=${REDIS_ADDR}
+      - IDP_PROVIDER=${IDP_PROVIDER:-ory}
+      - KRATOS_ADMIN_URL=${KRATOS_ADMIN_URL:-http://kratos:4434}
+      - HYDRA_ADMIN_URL=${HYDRA_ADMIN_URL:-http://hydra:4445}
+      - HYDRA_PUBLIC_URL=${HYDRA_PUBLIC_URL:-http://hydra:4444}
+      - DB_HOST=postgres
+      - CLICKHOUSE_HOST=clickhouse
+      - CLICKHOUSE_PORT=${CLICKHOUSE_PORT_NATIVE:-9000}
+      - CLICKHOUSE_USER=${CLICKHOUSE_USER:-baron}
+      - CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
+    depends_on:
+      clickhouse:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      oathkeeper:
+        condition: service_healthy
+      kratos:
+        condition: service_started
+      hydra:
+        condition: service_started
+      keto:
+        condition: service_started
+      infra_check:
+        condition: service_started
+    networks:
+      - baron_net
+      - ory-net
+    volumes:
+      - ./backend:/app
+    command: ["go", "run", "./cmd/server"]
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:3000/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
+  adminfront:
+    build:
+      context: ./adminfront
+      dockerfile: Dockerfile
+    container_name: baron_adminfront
+    env_file:
+      - .env
+    environment:
+      - APP_ENV=${APP_ENV:-development}
+      - API_PROXY_TARGET=http://baron_backend:3000
+    ports:
+      - "${ADMIN_PORT:-5173}:5173"
+    volumes:
+      - ./adminfront:/app
+      - /app/node_modules
+    networks:
+      - baron_net
+
+  devfront:
+    build:
+      context: ./devfront
+      dockerfile: Dockerfile
+    container_name: baron_devfront
+    env_file:
+      - .env
+    environment:
+      - APP_ENV=${APP_ENV:-development}
+      - API_PROXY_TARGET=http://baron_backend:3000
+    ports:
+      - "${DEVFRONT_PORT:-5174}:5173"
+    volumes:
+      - ./devfront:/app
+      - /app/node_modules
+    networks:
+      - baron_net
+
+  userfront:
+    build:
+      context: .
+      dockerfile: userfront/Dockerfile
+    container_name: baron_userfront
+    env_file:
+      - .env
+    environment:
+      - BACKEND_URL=${BACKEND_URL:-}
+      - USERFRONT_URL=${USERFRONT_URL}
+      - APP_ENV=${APP_ENV}
+    networks:
+      - baron_net
+      - ory-net
+    depends_on:
+      backend:
+        condition: service_healthy
+    command: >
+      /bin/sh -c "mkdir -p /usr/share/nginx/html/assets &&
+                  echo \"BACKEND_URL=$${BACKEND_URL}\" >> /usr/share/nginx/html/assets/.env &&
+                  echo \"USERFRONT_URL=$${USERFRONT_URL}\" >> /usr/share/nginx/html/assets/.env &&
+                  echo \"APP_ENV=$${APP_ENV}\" >> /usr/share/nginx/html/assets/.env &&
+                  cp /usr/share/nginx/html/assets/.env /usr/share/nginx/html/.env &&
+                  nginx -g 'daemon off;'"
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:5000/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
+  infra_check:
+    image: alpine
+    command: ["echo", "Infrastructure assumed running"]
+    networks:
+      - baron_net
+
+volumes:
+  postgres_data:
+  clickhouse_data:
+  redis_data:
+  ory_postgres_data:
+  ory_clickhouse_data:
+  oathkeeper_logs:
+
+networks:
+  baron_net:
+    external: true
+    name: baron_net
+  public_net:
+    external: true
+    name: public_net
+  ory-net:
+    external: true
+    name: ory-net
+  hydranet:
+    external: true
+    name: hydranet
+  kratosnet:
+    external: true
+    name: kratosnet
diff --git a/docs/SoT_Architecture_Policy.md b/docs/SoT_Architecture_Policy.md
new file mode 100644
index 00000000..8aaef239
--- /dev/null
+++ b/docs/SoT_Architecture_Policy.md
@@ -0,0 +1,44 @@
+# Baron SSO Data SoT (Source of Truth) Architecture Policy
+
+## 1. Core Principle: "Ory Stack is the Single Source of Truth"
+Baron SSO 시스템에서 인증(Identity), 인가(Authorization), OAuth2 위임(Delegation)의 데이터 원천은 **Ory Stack (Kratos, Keto, Hydra)** 입니다.
+Backend의 로컬 데이터베이스(PostgreSQL)는 성능 최적화, 검색, 감사(Audit), 비즈니스 메타데이터 관리를 위한 **Read-Model** 및 **Cold Storage**의 역할만 수행합니다.
+
+## 2. Component Policies
+
+### 2.1 Identity & User Profile (Ory Kratos)
+*   **SoT:** Ory Kratos Identity (`traits`, `metadata_public`)
+*   **Local DB (`users` Table):** **Read-Model & Search Index**
+    *   **목적:** 대규모 사용자 목록의 고속 검색(`LIKE`), 필터링, 정렬, 테넌트 조인(Join) 지원.
+    *   **동기화 전략:** `Async Write-Behind`
+        *   사용자 생성/수정 API는 Kratos 처리가 성공하면 즉시 성공 응답을 반환합니다.
+        *   로컬 DB 동기화는 별도 고루틴(Goroutine)에서 비동기로 수행됩니다.
+    *   **장애 격리:** 로컬 DB 장애가 사용자의 로그인/가입 프로세스를 차단하지 않습니다.
+
+### 2.2 Permissions & Relationships (Ory Keto)
+*   **SoT:** Ory Keto (Relation Tuples)
+*   **Local DB:**
+    *   권한 판단 로직을 로컬 DB에 저장하지 않습니다.
+    *   `Tenant`, `TenantGroup` 등 비즈니스 객체의 **생성/삭제 이벤트**를 Keto의 관계(Relation)로 비동기 동기화합니다.
+    *   모든 권한 검증(`CheckPermission`)은 반드시 Keto API를 통해 실시간으로 수행합니다.
+
+### 2.3 OAuth2 Clients & Sessions (Ory Hydra)
+*   **SoT:** Ory Hydra (OAuth2 Clients, Access/Refresh Tokens, Consent Sessions)
+*   **Local DB (`client_secrets`, `client_consents`):** **Backup & Query-Model**
+    *   `client_secrets`: Hydra는 해시된 시크릿만 저장하므로, 시크릿 재발급 및 관리를 위한 **원본 보관소(Cold Storage)**로 사용합니다.
+    *   `client_consents`: Hydra API는 "특정 사용자의 동의 내역" 조회만 지원하므로, "특정 클라이언트의 전체 사용자 동의 목록"을 제공하기 위한 **조회용 모델(Query-Model)**로 사용합니다.
+
+## 3. Data Flow & Synchronization Strategy
+
+### 3.1 Write Path (Command)
+1.  **Request:** 클라이언트가 Backend API 요청.
+2.  **Ory Exec:** Backend가 Ory 서비스(Kratos/Hydra/Keto) API를 동기(Synchronous) 호출.
+3.  **Response:** Ory 성공 시 클라이언트에게 즉시 성공 응답 반환 (SoT 확정).
+4.  **Sync:** Backend가 비동기(Goroutine)로 로컬 DB 테이블을 갱신.
+
+### 3.2 Read Path (Query)
+*   **Self Context (내 정보, 내 권한):** Ory Session/Token을 통해 직접 검증하거나 Kratos/Keto를 실시간 조회 (Always Fresh).
+*   **Admin Context (목록 조회, 검색):** 로컬 DB를 조회하여 빠른 응답 제공 (Eventually Consistent).
+
+### 3.3 Conflict Resolution
+*   데이터 불일치가 발견될 경우, 항상 **Ory Stack의 데이터를 기준(Authority)**으로 로컬 DB를 보정(Self-healing)합니다.
diff --git a/docs/i18n.md b/docs/i18n.md
index 6faa0738..ed4400ab 100644
--- a/docs/i18n.md
+++ b/docs/i18n.md
@@ -79,6 +79,7 @@ TOML에서는 `[Section]`을 사용하여 계층을 표현합니다.
     *   `ko` 계열이면 `/ko/dashboard`로 리다이렉트합니다.
     *   그 외에는 `/en/dashboard`로 리다이렉트합니다.
     *   *단, 이전에 언어를 선택한 쿠키나 로컬스토리지 값이 있다면 그 값을 우선합니다.*
+    *   로컬스토리지 키는 **`locale`**을 사용합니다.
 2.  **언어 변경 시**:
     *   모든 화면에는 **언어 선택기(Language Selector)**가 노출되어야 합니다.
     *   변경 시 해당 언어의 URL로 이동(`window.location` 변경 혹은 Router Push)하며, 선택된 언어를 로컬스토리지에 저장합니다.
diff --git a/docs/trouble-shooting/userfront-locale.md b/docs/trouble-shooting/userfront-locale.md
new file mode 100644
index 00000000..2baeb457
--- /dev/null
+++ b/docs/trouble-shooting/userfront-locale.md
@@ -0,0 +1,86 @@
+# userfront locale 전환 문제 분석 및 대응
+
+## 증상
+- URL은 `/ko` ↔ `/en`으로 변경되지만 실제 텍스트가 바뀌지 않음.
+- 브라우저에서 `window.localStorage.getItem('locale')`가 계속 `null`.
+- 빌드/배포 후에도 동일 증상 유지.
+
+## 현재 구조 요약
+- Flutter Web + `easy_localization` 사용.
+- 경로 기반 로케일: `/:locale` 라우트 + `LocaleGate`로 로케일 적용.
+- 번역 리소스: `userfront/assets/translations/*.toml`.
+- 로케일 저장: `localStorage` key `locale`.
+
+## 이미 적용한 변경
+- `easy_localization` + TOML loader 적용.
+- `LocaleGate`에서 로케일 적용 및 저장.
+- `LanguageSelector`에서 로케일 저장 + URL 변경.
+- `userfront/assets/translations`에 `en.toml`, `ko.toml`, `template.toml` 포함.
+- `pubspec.yaml` assets 등록.
+- GoRouter 호환성 수정(빌드 오류 대응).
+
+## 원인 후보(우선순위)
+1) **로케일 저장이 실제로 실행되지 않음**
+   - `LanguageSelector` 클릭 이벤트가 동작하지 않거나,
+   - `LocaleGate`가 호출되지 않는 라우트 진입(예: 라우트 변경 없이 SPA 상태만 변경).
+
+2) **서비스 워커/캐시로 인해 구 번들이 계속 로드됨**
+   - Flutter Web 기본 `flutter_service_worker.js`가 캐시를 고정.
+   - 기존 번들이 남아 `LocaleStorage.write()` 반영 전 코드가 계속 실행될 가능성.
+
+3) **번역 리소스 미로딩**
+   - `assets/translations/en.toml`, `ko.toml` 요청이 404 또는 미요청.
+   - Nginx 경로/정적 파일 설정에서 `assets/`가 누락된 경우.
+
+4) **en.toml 키 누락으로 fallback 문자열이 표시됨**
+   - UI에서 `tr(..., fallback: '한국어')`를 쓰는 경우,
+     en.toml에 키가 없으면 한국어가 그대로 노출됨.
+
+## 확인 방법(권장 순서)
+1) **로케일 저장 확인**
+   - 언어 변경 후 콘솔:
+     - `window.localStorage.getItem('locale')`
+   - `null`이면 저장 로직 실행 실패.
+
+2) **번역 리소스 요청 확인**
+   - DevTools Network에서:
+     - `/assets/translations/ko.toml`
+     - `/assets/translations/en.toml`
+   - 404 또는 미요청이면 assets 로딩 문제.
+
+3) **로케일 반영 확인**
+   - UI 내 임시 텍스트로 `context.locale.languageCode` 출력
+   - 로케일이 바뀌는데 텍스트가 그대로면 TOML 키 누락 가능성.
+
+4) **캐시 무효화**
+   - 하드 리로드(Shift+Reload)
+   - service worker 제거 후 재접속
+
+## 현재까지 실행한 대응
+- `LocaleGate`에서 로케일 동일 여부와 상관없이 `LocaleStorage.write()`가 실행되도록 수정.
+- 라우터 로케일 파싱/전환 로직 보강.
+- 번역 리소스 파일 배치 및 assets 등록.
+
+## 앞으로의 대응 계획
+1) **서비스 워커 캐시 무효화 전략**
+   - `flutter_service_worker.js` 버전 갱신 또는 Nginx 캐시 무력화 정책 적용.
+   - 배포 시 `index.html`/`flutter_service_worker.js` 캐시 제어 헤더 추가.
+
+2) **번역 파일 누락 방지**
+   - `scripts/sync_userfront_locales.sh`를 CI에서 자동 실행.
+   - en/ko 키 누락 검증 테스트 추가.
+
+3) **로케일 저장 검증**
+   - 언어 변경 후 `localStorage`에 값이 반드시 들어오는지 E2E 체크 추가.
+
+4) **fallback 사용 최소화**
+   - userfront에서 `fallback` 문자열(한국어) 남용 구간 정리.
+   - en.toml에 키가 없을 때 한국어가 보이는 현상 방지.
+
+## 참고 파일
+- `userfront/lib/core/i18n/locale_gate.dart`
+- `userfront/lib/core/widgets/language_selector.dart`
+- `userfront/lib/core/i18n/locale_storage_web.dart`
+- `userfront/lib/core/i18n/toml_asset_loader.dart`
+- `userfront/assets/translations/en.toml`
+- `userfront/assets/translations/ko.toml`
diff --git a/locales/en.toml b/locales/en.toml
index d98c74fe..c60f9b62 100644
--- a/locales/en.toml
+++ b/locales/en.toml
@@ -43,6 +43,7 @@ missing = "Missing"
 [msg]
 
 [msg.admin]
+logout_confirm = "Are you sure you want to log out?"
 idp_env_prod = "IDP env: prod"
 scope_admin = "Scoped to /admin"
 session_ttl = "Session TTL: 15m admin"
@@ -354,7 +355,7 @@ title_with_code = "Title With Code"
 type = "Type"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "$NormalizedCode"
+settings_disabled = "Account settings are currently unavailable."
 
 [msg.userfront.forgot]
 description = "Description"
@@ -370,10 +371,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"
@@ -381,7 +382,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"
@@ -840,9 +841,6 @@ role = "ROLE"
 status = "STATUS"
 tenant_dept = "TENANT / DEPT"
 
-[ui.btn]
-cancel = "Cancel"
-save = "Save"
 
 [ui.common]
 add = "Add"
@@ -872,6 +870,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"
@@ -1090,11 +1091,9 @@ title = "Stack readiness"
 plane = "Dev Plane"
 subtitle = "Manage your applications"
 
-[ui.nav]
-dashboard = "Dashboard"
 
 [ui.userfront]
-app_title = "App Title"
+app_title = "Baron SW Portal"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1164,7 +1163,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]
@@ -1178,7 +1177,7 @@ title = "Title"
 [ui.userfront.login.qr]
 expired = "Expired"
 refresh = "Refresh"
-remaining = "Remaining"
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = "Digits"
@@ -1187,9 +1186,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"
@@ -1305,3 +1304,15 @@ verify = "Verify"
 
 [ui.userfront.signup.success]
 action = "Action"
+
+[ui.admin.nav]
+api_keys = "API Keys"
+audit_logs = "Audit Logs"
+auth_guard = "Auth Guard"
+logout = "Logout"
+overview = "Overview"
+relying_parties = "Apps (RP)"
+tenant_dashboard = "Tenant Dashboard"
+tenant_groups = "Tenant Groups"
+tenants = "Tenants"
+users = "Users"
diff --git a/locales/ko.toml b/locales/ko.toml
index 75dc6e58..cab3306a 100644
--- a/locales/ko.toml
+++ b/locales/ko.toml
@@ -43,6 +43,7 @@ missing = "활성 세션이 없습니다."
 [msg]
 
 [msg.admin]
+logout_confirm = "로그아웃 하시겠습니까?"
 idp_env_prod = "IDP env: prod"
 scope_admin = "Scoped to /admin"
 session_ttl = "Session TTL: 15m admin"
@@ -354,7 +355,7 @@ title_with_code = "오류: {{code}}"
 type = "오류 종류: {{type}}"
 
 [msg.userfront.error.whitelist]
-$normalizedCode = "에러가 계속되면 관리자에게 문의해주세요"
+settings_disabled = "현재 계정 설정 화면은 준비 중입니다."
 
 [msg.userfront.forgot]
 description = "계정과 연결된 이메일 주소 또는 휴대폰 번호를 입력하시면, 비밀번호를 재설정할 수 있는 링크를 보내드립니다."
@@ -370,10 +371,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 = "로그인 토큰을 확인할 수 없습니다."
@@ -840,9 +841,6 @@ role = "ROLE"
 status = "STATUS"
 tenant_dept = "TENANT / DEPT"
 
-[ui.btn]
-cancel = "취소"
-save = "저장"
 
 [ui.common]
 add = "추가"
@@ -872,6 +870,9 @@ retry = "다시 시도"
 save = "저장"
 search = "검색"
 show_more = "+ 더보기"
+language = "언어"
+language_ko = "한국어"
+language_en = "English"
 theme_dark = "Dark"
 theme_light = "Light"
 theme_toggle = "테마 전환"
@@ -1090,11 +1091,9 @@ title = "Stack readiness"
 plane = "Dev Plane"
 subtitle = "Manage your applications"
 
-[ui.nav]
-dashboard = "대시보드"
 
 [ui.userfront]
-app_title = "Baron 로그인"
+app_title = "Baron SW 포탈"
 
 [ui.userfront.app_label]
 admin_console = "Admin Console"
@@ -1305,3 +1304,15 @@ verify = "본인인증"
 
 [ui.userfront.signup.success]
 action = "로그인하기"
+
+[ui.admin.nav]
+api_keys = "API 키"
+audit_logs = "감사 로그"
+auth_guard = "인증 가드"
+logout = "로그아웃"
+overview = "개요"
+relying_parties = "애플리케이션(RP)"
+tenant_dashboard = "테넌트 대시보드"
+tenant_groups = "테넌트 그룹"
+tenants = "테넌트"
+users = "사용자"
diff --git a/locales/template.toml b/locales/template.toml
index a01d715d..c11280bb 100644
--- a/locales/template.toml
+++ b/locales/template.toml
@@ -44,6 +44,7 @@ missing = ""
 
 [msg.admin]
 idp_env_prod = ""
+logout_confirm = ""
 scope_admin = ""
 session_ttl = ""
 tenant_headers = ""
@@ -354,7 +355,7 @@ title_with_code = ""
 type = ""
 
 [msg.userfront.error.whitelist]
-$normalizedCode = ""
+settings_disabled = ""
 
 [msg.userfront.forgot]
 description = ""
@@ -658,6 +659,18 @@ name = ""
 [ui.admin.header]
 plane = ""
 
+[ui.admin.nav]
+api_keys = ""
+audit_logs = ""
+auth_guard = ""
+logout = ""
+overview = ""
+relying_parties = ""
+tenant_dashboard = ""
+tenant_groups = ""
+tenants = ""
+users = ""
+
 [ui.admin.overview]
 kicker = ""
 title = ""
@@ -840,9 +853,6 @@ role = ""
 status = ""
 tenant_dept = ""
 
-[ui.btn]
-cancel = ""
-save = ""
 
 [ui.common]
 add = ""
@@ -872,6 +882,9 @@ retry = ""
 save = ""
 search = ""
 show_more = ""
+language = ""
+language_ko = ""
+language_en = ""
 theme_dark = ""
 theme_light = ""
 theme_toggle = ""
@@ -1090,8 +1103,6 @@ title = ""
 plane = ""
 subtitle = ""
 
-[ui.nav]
-dashboard = ""
 
 [ui.userfront]
 app_title = ""
@@ -1178,7 +1189,7 @@ title = ""
 [ui.userfront.login.qr]
 expired = ""
 refresh = ""
-remaining = ""
+remaining = "Remaining: {{time}}"
 
 [ui.userfront.login.short_code]
 digits = ""
diff --git a/scripts/sync_userfront_locales.sh b/scripts/sync_userfront_locales.sh
new file mode 100755
index 00000000..023fdf66
--- /dev/null
+++ b/scripts/sync_userfront_locales.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+# 루트 locales/*.toml -> userfront/assets/translations/ 동기화
+# - userfront에서 사용하는 섹션만 추출
+# - {{param}} -> {param} 변환 (easy_localization 포맷)
+repo_root="$(cd "$(dirname "$0")/.." && pwd)"
+src_dir="$repo_root/locales"
+dest_dir="$repo_root/userfront/assets/translations"
+
+mkdir -p "$dest_dir"
+
+filter_toml() {
+  src_file="$1"
+  dest_file="$2"
+  awk '
+    function allowed(section) {
+      return section ~ /^(ui\.userfront|msg\.userfront|err\.userfront|ui\.common)(\.|$)/;
+    }
+    BEGIN { keep = 0; }
+    {
+      line = $0;
+      if (match(line, /^[[:space:]]*\[[^]]+\][[:space:]]*$/)) {
+        section = line;
+        gsub(/^[[:space:]]*\[/, "", section);
+        gsub(/\][[:space:]]*$/, "", section);
+        keep = allowed(section);
+        if (keep) {
+          print line;
+        }
+        next;
+      }
+      if (keep) {
+        print line;
+      }
+    }
+  ' "$src_file" \
+    | sed -E 's/\{\{[[:space:]]*([a-zA-Z0-9_]+)[[:space:]]*\}\}/{\1}/g' \
+    > "$dest_file"
+}
+
+for file in "$src_dir"/*.toml; do
+  base="$(basename "$file")"
+  filter_toml "$file" "$dest_dir/$base"
+done
+
+echo "Synced locales to userfront assets: $dest_dir"
diff --git a/tools/i18n-scanner/report.js b/tools/i18n-scanner/report.js
new file mode 100644
index 00000000..657fdbe0
--- /dev/null
+++ b/tools/i18n-scanner/report.js
@@ -0,0 +1,237 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const ROOT_DIR = process.cwd();
+const LOCALES_DIR = path.join(ROOT_DIR, 'locales');
+const TEMPLATE_PATH = path.join(LOCALES_DIR, 'template.toml');
+const LANG_FILES = ['ko.toml', 'en.toml'];
+
+const SKIP_DIRS = new Set([
+  '.git',
+  'node_modules',
+  'dist',
+  'build',
+  '.dart_tool',
+  '.idea',
+  '.vscode',
+  'coverage',
+  '.next',
+  '.cache',
+  'tmp',
+  'logs',
+]);
+
+const CODE_EXTENSIONS = new Set(['.ts', '.tsx', '.dart']);
+
+const CODE_PATTERNS = [
+  /\b(?:i18n\.)?t\s*\(\s*['"]([^'"]+)['"]/g,
+  /\btr\s*\(\s*['"]([^'"]+)['"]/g,
+  /['"]([^'"]+)['"]\s*\.tr\s*\(/g,
+];
+
+function readFileRequired(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return { ok: false, error: `파일이 없습니다: ${filePath}` };
+  }
+  return { ok: true, value: fs.readFileSync(filePath, 'utf8') };
+}
+
+function parseTomlKeys(filePath) {
+  const result = readFileRequired(filePath);
+  if (!result.ok) {
+    return { ok: false, error: result.error, keys: new Set() };
+  }
+
+  const keys = new Set();
+  const lines = result.value.split(/\r?\n/);
+  let currentSection = [];
+
+  for (const rawLine of lines) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith('#')) {
+      continue;
+    }
+
+    if (line.startsWith('[[') && line.endsWith(']]')) {
+      const sectionName = line.slice(2, -2).trim();
+      currentSection = sectionName
+        ? sectionName.split('.').map((p) => p.trim()).filter(Boolean)
+        : [];
+      continue;
+    }
+
+    if (line.startsWith('[') && line.endsWith(']')) {
+      const sectionName = line.slice(1, -1).trim();
+      currentSection = sectionName
+        ? sectionName.split('.').map((p) => p.trim()).filter(Boolean)
+        : [];
+      continue;
+    }
+
+    const eqIndex = line.indexOf('=');
+    if (eqIndex === -1) {
+      continue;
+    }
+
+    const key = line.slice(0, eqIndex).trim();
+    if (!key) {
+      continue;
+    }
+
+    const fullKey = [...currentSection, key].join('.');
+    keys.add(fullKey);
+  }
+
+  return { ok: true, keys };
+}
+
+function walkDir(dirPath, files) {
+  const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      if (SKIP_DIRS.has(entry.name)) {
+        continue;
+      }
+      walkDir(path.join(dirPath, entry.name), files);
+      continue;
+    }
+
+    if (!entry.isFile()) {
+      continue;
+    }
+
+    const ext = path.extname(entry.name).toLowerCase();
+    if (!CODE_EXTENSIONS.has(ext)) {
+      continue;
+    }
+
+    files.push(path.join(dirPath, entry.name));
+  }
+}
+
+function collectCodeKeys() {
+  const files = [];
+  walkDir(ROOT_DIR, files);
+
+  const keys = new Set();
+  for (const filePath of files) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    for (const pattern of CODE_PATTERNS) {
+      let match;
+      while ((match = pattern.exec(content)) !== null) {
+        if (match[1]) {
+          keys.add(match[1]);
+        }
+      }
+    }
+  }
+
+  return keys;
+}
+
+function difference(aSet, bSet) {
+  const result = [];
+  for (const item of aSet) {
+    if (!bSet.has(item)) {
+      result.push(item);
+    }
+  }
+  return result.sort();
+}
+
+function buildReport() {
+  const report = {
+    generated_at: new Date().toISOString(),
+    errors: [],
+    warnings: [],
+    details: {
+      missing_in_template: [],
+      missing_in_lang: {},
+      unused_in_template: [],
+    },
+  };
+
+  const templateResult = parseTomlKeys(TEMPLATE_PATH);
+  if (!templateResult.ok) {
+    report.errors.push(templateResult.error);
+    return report;
+  }
+
+  const templateKeys = templateResult.keys;
+  const codeKeys = collectCodeKeys();
+
+  const langKeyMap = new Map();
+  for (const fileName of LANG_FILES) {
+    const langPath = path.join(LOCALES_DIR, fileName);
+    const langResult = parseTomlKeys(langPath);
+    if (!langResult.ok) {
+      report.errors.push(langResult.error);
+      continue;
+    }
+    langKeyMap.set(fileName, langResult.keys);
+  }
+
+  for (const [fileName, langKeys] of langKeyMap.entries()) {
+    const missingInLang = difference(templateKeys, langKeys);
+    if (missingInLang.length > 0) {
+      report.errors.push(
+        `[Sync Error] ${fileName} 누락 키 ${missingInLang.length}개`,
+      );
+      report.details.missing_in_lang[fileName] = missingInLang;
+    }
+  }
+
+  const missingInTemplate = difference(codeKeys, templateKeys);
+  if (missingInTemplate.length > 0) {
+    report.errors.push(
+      `[Missing Key] template.toml 누락 키 ${missingInTemplate.length}개`,
+    );
+    report.details.missing_in_template = missingInTemplate;
+  }
+
+  const unusedInTemplate = difference(templateKeys, codeKeys);
+  if (unusedInTemplate.length > 0) {
+    report.warnings.push(
+      `[Unused Key] template.toml 미사용 키 ${unusedInTemplate.length}개`,
+    );
+    report.details.unused_in_template = unusedInTemplate;
+  }
+
+  return report;
+}
+
+function main() {
+  const report = buildReport();
+  const outDir = path.join(ROOT_DIR, 'reports');
+  if (!fs.existsSync(outDir)) {
+    fs.mkdirSync(outDir, { recursive: true });
+  }
+  const outPath = path.join(outDir, 'i18n-report.json');
+  fs.writeFileSync(outPath, JSON.stringify(report, null, 2));
+  const summaryPath = path.join(outDir, 'i18n-report.txt');
+
+  const lines = [];
+  lines.push(`generated_at: ${report.generated_at}`);
+  if (report.errors.length > 0) {
+    lines.push('errors:');
+    report.errors.forEach((err) => lines.push(`- ${err}`));
+  } else {
+    lines.push('errors: none');
+  }
+  if (report.warnings.length > 0) {
+    lines.push('warnings:');
+    report.warnings.forEach((warn) => lines.push(`- ${warn}`));
+  } else {
+    lines.push('warnings: none');
+  }
+  fs.writeFileSync(summaryPath, lines.join('\n'));
+
+  if (report.errors.length > 0) {
+    process.exit(1);
+  }
+}
+
+main();
diff --git a/userfront/Dockerfile b/userfront/Dockerfile
index aab98a00..dadfb397 100644
--- a/userfront/Dockerfile
+++ b/userfront/Dockerfile
@@ -1,10 +1,11 @@
 # Stage 1: Build Flutter
-FROM ghcr.io/cirruslabs/flutter:stable AS build
+FROM ghcr.io/cirruslabs/flutter:3.38.0 AS build
 ENV RUN_FLUTTER_AS_ROOT=true
-# ENV RUN_FLUTTER_AS_ROOT=true
 WORKDIR /app
 COPY . .
 # Get dependencies and build for web
+RUN /bin/sh ./scripts/sync_userfront_locales.sh
+WORKDIR /app/userfront
 RUN flutter pub get
 RUN touch .env
 RUN flutter build web --release --no-tree-shake-icons --wasm
@@ -12,9 +13,9 @@ RUN flutter build web --release --no-tree-shake-icons --wasm
 # Stage 2: Serve with Nginx
 FROM nginx:alpine
 # Copy built assets
-COPY --from=build /app/build/web /usr/share/nginx/html
+COPY --from=build /app/userfront/build/web /usr/share/nginx/html
 # Copy custom Nginx config
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY userfront/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 5000
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/userfront/assets/translations/en.toml b/userfront/assets/translations/en.toml
new file mode 100644
index 00000000..31bac5e7
--- /dev/null
+++ b/userfront/assets/translations/en.toml
@@ -0,0 +1,536 @@
+[err.userfront]
+
+[err.userfront.auth_proxy]
+consent_accept = "Consent Accept"
+consent_fetch = "Consent Fetch"
+consent_reject = "Consent Reject"
+linked_app_revoke = "Linked App Revoke"
+login_failed = "Login Failed"
+oidc_accept = "OIDC Accept"
+password_reset_complete = "Password Reset Complete"
+password_reset_init = "Password Reset Init"
+
+[err.userfront.profile]
+load_failed = "Load Failed"
+password_change_failed = "Password Change Failed"
+send_code_failed = "Send Code Failed"
+update_failed = "Update Failed"
+verify_code_failed = "Verify Code Failed"
+
+[err.userfront.session]
+missing = "Missing"
+
+[msg.userfront]
+greeting = "Greeting"
+
+[msg.userfront.audit]
+date = "Date"
+device = "Device"
+end = "End"
+ip = "Ip"
+load_more_error = "Load More Error"
+result = "Result"
+session_id = "Session ID: {value}"
+status = "Status"
+
+[msg.userfront.dashboard]
+approved_device = "Approved Device"
+approved_ip = "Approve IP: {ip}"
+audit_empty = "Audit Empty"
+audit_load_error = "Audit Load Error"
+auth_method = "Auth Method"
+client_id = "Client ID: {id}"
+client_id_missing = "Client Id Missing"
+current_status = "Current Status"
+last_auth = "Last Auth"
+link_missing = "Link Missing"
+link_open_error = "Link Open Error"
+session_id_copied = "Session Id Copied"
+
+[msg.userfront.dashboard.activities]
+empty = "Empty"
+empty_detail = "Empty Detail"
+error = "Error"
+
+[msg.userfront.dashboard.approved_session]
+copy_click = "Copy Click"
+copy_tap = "Copy Tap"
+none = "None"
+
+[msg.userfront.dashboard.revoke]
+confirm = "Confirm"
+error = "Error"
+success = "Success"
+
+[msg.userfront.dashboard.scopes]
+empty = "Empty"
+
+[msg.userfront.dashboard.timeline]
+load_error = "Load Error"
+
+[msg.userfront.error]
+detail_contact = "msg.userfront.error.detail_contact"
+detail_generic = "Detail Generic"
+detail_request = "Detail Request"
+id = "Id"
+title = "Title"
+title_generic = "Title Generic"
+title_with_code = "Title With Code"
+type = "Type"
+
+[msg.userfront.error.whitelist]
+settings_disabled = "Account settings are currently unavailable."
+
+[msg.userfront.forgot]
+description = "Description"
+dry_send = "Dry Send"
+error = "Error"
+input_required = "Input Required"
+sent = "Sent"
+
+[msg.userfront.login]
+cookie_check_failed = "Cookie Check Failed"
+dry_send = "Dry Send"
+link_failed = "Link Failed"
+link_send_failed = "Link Send Failed"
+link_sent_email = "Link Sent Email"
+link_sent_phone = "Link Sent Phone"
+link_timeout = "Time expired."
+no_account = "No Account"
+oidc_failed = "OIDC Failed"
+qr_expired = "Time expired."
+qr_init_failed = "QR Init Failed"
+qr_login_required = "QR Login Required"
+token_missing = "Token Missing"
+verification_failed = "Verification Failed"
+
+[msg.userfront.login.link]
+approved = "Approved"
+helper = "Sending you a login link"
+missing_login_id = "Missing Login Id"
+missing_phone = "Missing Phone"
+resend_wait = "Resend Wait"
+short_code_help = "Short Code Help"
+
+[msg.userfront.login.password]
+failed = "Failed"
+missing_credentials = "Missing Credentials"
+
+[msg.userfront.login.qr]
+load_failed = "Load Failed"
+scan_hint = "Scan Hint"
+
+[msg.userfront.login.short_code]
+invalid = "Invalid"
+
+[msg.userfront.login.unregistered]
+body = "Body"
+
+[msg.userfront.login.verification]
+approved = "Approved"
+approved_local = "Approved Local"
+success = "Success"
+
+[msg.userfront.login_success]
+subtitle = "Subtitle"
+
+[msg.userfront.profile]
+department_missing = "Department Missing"
+department_required = "Department Required"
+email_missing = "Email Missing"
+greeting = "Greeting"
+load_failed = "Load Failed"
+name_missing = "Name Missing"
+name_required = "Name Required"
+phone_required = "Phone Required"
+phone_verify_required = "Phone Verify Required"
+update_failed = "Update Failed"
+update_success = "Update Success"
+
+[msg.userfront.profile.password]
+change_failed = "Change Failed"
+changed = "Changed"
+current_required = "Current Required"
+mismatch = "Mismatch"
+new_required = "New Required"
+subtitle = "Subtitle"
+
+[msg.userfront.profile.phone]
+code_sent = "Code Sent"
+send_failed = "Send Failed"
+verified = "Verified"
+verify_failed = "Verify Failed"
+verify_notice = "Verify Notice"
+
+[msg.userfront.profile.section]
+basic = "Basic"
+organization = "Organization"
+security = "Security"
+
+[msg.userfront.qr]
+approve_error = "Approve Error"
+approve_success = "Approve Success"
+camera_error = "Camera Error"
+permission_error = "Permission Error"
+permission_required = "Permission Required"
+
+[msg.userfront.reset]
+invalid_body = "Invalid Body"
+invalid_link = "Invalid Link"
+invalid_title = "Invalid Title"
+policy_loading = "Policy Loading"
+success = "Success"
+
+[msg.userfront.reset.error]
+empty_password = "Please enter Password."
+generic = "Generic"
+lowercase = "Lowercase"
+min_length = "Min Length"
+min_types = "Min Types"
+mismatch = "Mismatch"
+number = "Number"
+symbol = "Symbol"
+uppercase = "Uppercase"
+
+[msg.userfront.reset.policy]
+lowercase = "Lowercase"
+min_length = "Min Length"
+min_types = "Min Types"
+number = "Number"
+symbol = "Symbol"
+uppercase = "Uppercase"
+
+[msg.userfront.sections]
+apps_subtitle = "Apps Subtitle"
+audit_subtitle = "Audit Subtitle"
+
+[msg.userfront.settings]
+disabled = "Disabled"
+
+[msg.userfront.signup]
+failed = "Failed"
+privacy_full = "\\n개인정보 수집 및 이용 동의\\n\\n바론서비스 개인정보처리방침\\n\\n제1조 (목적)\\n바론컨설턴트(이하 \\\"회사\\\")는 바론서비스(이하 \\\"서비스\\\")를 이용하는 고객(이하 \\\"이용자\\\")의 개인정보를 보호하고, 「개인정보 보호법」에 따라 책임과 의무를 다하기 위해 본 개인정보처리방침을 마련했습니다. 본 방침은 이용자가 제공한 개인정보가 어떻게 수집, 이용, 보관, 보호되는지를 설명합니다.\\n제2조 (개인정보의 처리목적)\\n회사는 다음의 목적을 위해 개인정보를 처리합니다. 처리하고 있는 개인정보는 다음의 목적 이외의 용도로는 이용되지 않으며, 이용 목적이 변경되는 경우에는 「개인정보 보호법」 제18조에 따라 별도의 동의를 받는 등 필요한 조치를 이행할 예정입니다.\\n- 본인확인: 회원가입 및 관리를 위한 본인 확인, 전화 또는 이메일을 통한 연락\\n- 서비스 제공: 각종 통보 및 서비스 제공을 위한 업무 처리\\n- 제품소개서 다운로드: 설명자료 전달\\n- 상담 및 데모 신청: 상담 제공 및 데모 제공, 계약 처리자 정보 수집\\n- 행사 참가 신청: 참석 안내 및 세미나/설명회/교육 제공\\n- 보안가이드 제공: 안내자료 전달\\n- 기술지원 문의: 서비스 사용 지원\\n- 서비스 개선 의견 접수: 서비스 품질 개선\\n- 마케팅 활동: 동의한 고객에 한해 뉴스레터 및 매거진 발송\\n제3조 (개인정보의 처리 및 보유 기간)\\n① 회사는 법령에 따른 개인정보 보유 및 이용기간 또는 정보주체로부터 개인정보를 수집 시 동의받은 개인정보 보유 및 이용기간 내에서 개인정보를 처리 및 보유합니다.\\n② 각각의 개인정보 처리 및 보유 기간은 다음과 같습니다:\\n- 회원정보: 회원가입일부터 회원탈퇴 후 1년까지\\n- 홍보, 상담, 계약용 개인정보: 2년\\n제4조 (개인정보의 제3자 제공)\\n① 회사는 정보주체의 개인정보를 제2조에서 명시한 범위 내에서만 처리하며, 정보 주체의 동의, 법률의 특별한 규정 등 「개인정보 보호법」 제17조 및 제18조에 해당하는 경우에만 개인정보를 제3자에게 제공합니다.\\n② 회사는 다음과 같이 개인정보를 제3자에게 제공하고 있습니다:\\n- 제공받는 자: 수사기관 및 유관기관, 피신고업체\\n- 이용 목적: 개인정보 침해 민원 처리\\n- 제공하는 개인정보 항목: 성명, 연락처, 이메일\\n- 보유 및 이용기간: 법령에서 정한 보존기간 및 제공목적 달성 시 파기\\n제5조 (개인정보 처리 위탁)\\n① 회사는 개인정보 처리업무를 외부 업체에 위탁하지 않으며, 자체적으로 처리하고 있습니다.\\n② 회사가 특정 업무(예: 채용 업무)를 외부 업체에 위탁할 경우, 개인정보 처리방침 시행 전 회사 홈페이지에서 공지한 후 정보주체의 동의를 받은 후 위탁합니다.\\n제6조 (정보주체의 권리·의무 및 행사 방법)\\n① 정보주체는 회사에 대해 언제든지 개인정보 열람, 정정, 삭제, 처리정지 요구 등의 권리를 행사할 수 있습니다.\\n② 권리 행사는 다음과 같은 방법으로 할 수 있습니다:\\n- 서면: 회사 주소로 서면 제출\\n- 전자우편: 회사 이메일로 요청\\n- 모사전송(FAX): 회사 FAX로 요청\\n③ 권리 행사는 정보주체의 법정대리인이나 위임을 받은 자를 통해 대리로도 가능합니다. 이 경우 “개인정보 처리 방법에 관한 고시” 별지 제11호 서식에 따른 위임장을 제출해야 합니다.\\n④ 개인정보 열람 및 처리정지 요구는 「개인정보 보호법」 제35조 제4항, 제37조 제2항에 따라 제한될 수 있습니다.\\n⑤ 개인정보의 정정 및 삭제 요구는 다른 법령에 따라 수집된 개인정보인 경우 제한될 수 있습니다.\\n⑥ 회사는 권리 행사를 요청한 자가 본인 또는 정당한 대리인인지를 확인합니다.\\n제7조 (처리하는 개인정보의 항목)\\n회사는 다음의 개인정보 항목을 처리합니다:\\n- 수집 항목:\\n- 필수 항목: 성명, 휴대전화번호, 이메일\\n- 선택 항목: 회사전화번호, 문의사항\\n- 수집 방법:\\n- 홈페이지, 전화, 이메일을 통해 수집\\n제8조 (개인정보의 파기)\\n① 회사는 개인정보 보유 기간의 경과, 처리 목적 달성 등 개인정보가 불필요하게 되었을 때 지체 없이 해당 개인정보를 파기합니다.\\n② 정보주체로부터 동의받은 개인정보 보유 기간이 경과하거나 처리 목적이 달성된 경우에도 다른 법령에 따라 개인정보를 계속 보존해야 할 경우에는, 해당 개인정보를 별도의 데이터베이스(DB)로 옮기거나 보관 장소를 달리하여 보존합니다.\\n③ 개인정보 파기의 절차 및 방법은 다음과 같습니다:\\n- 파기 절차: 회사는 파기 사유가 발생한 개인정보를 선정하고, 개인정보 보호책임자의 승인을 받아 개인정보를 파기합니다.\\n- 파기 방법: 전자적 파일 형태로 기록된 개인정보는 복구할 수 없도록 기술적 방법을 사용해 삭제하며, 종이 문서에 기록된 개인정보는 분쇄기로 분쇄하거나 소각하여 파기합니다.\\n제9조 (개인정보의 안전성 확보 조치)\\n회사는 개인정보의 안전성 확보를 위해 다음과 같은 조치를 취합니다:\\n- 관리적 조치: 내부관리계획 수립·시행, 정기적 직원 교육\\n- 기술적 조치: 개인정보처리시스템 접근 권한 관리, 접근통제시스템 설치, 고유식별정보 암호화, 보안 프로그램 설치\\n- 물리적 조치: 전산실 및 자료보관실 접근 통제\\n제10조 (개인정보 자동 수집 장치의 설치·운영 및 거부에 관한 사항)\\n회사는 쿠키(Cookie)를 사용하지 않습니다. 쿠키는 이용자의 이용 정보를 저장하고 수시로 불러오는 작은 파일로, 바론서비스에서는 쿠키를 사용하지 않습니다.\\n제11조 (개인정보 보호책임자)\\n회사는 개인정보 처리에 관한 업무를 총괄하여 책임지고, 개인정보 처리와 관련된 정보주체의 불만처리 및 피해구제를 위해 개인정보 보호책임자를 지정하고 있습니다.\\n개인정보 보호책임자:\\n- 성명: 염승호\\n- 직책: 수석연구원\\n- 연락처: 02-2141-7448\\n- 팩스번호: 02-2141-7599\\n- 이메일: b23008@baroncs.co.kr\\n제12조 (개인정보 열람청구)\\n정보주체는 「개인정보 보호법」 제35조에 따른 개인정보 열람 청구를 아래 부서에 할 수 있습니다. 회사는 정보주체의 개인정보 열람청구가 신속하게 처리되도록 노력하겠습니다.\\n개인정보 열람청구 접수·처리 부서:\\n- 부서명: 총괄기획실\\n- 담당자: 권혁진\\n- 연락처: 02-2141-7465\\n- 팩스번호: 02-2141-7599\\n- 이메일: baroncs@baroncs.co.kr\\n제13조 (권익침해 구제방법)\\n정보주체는 개인정보 침해로 인한 구제를 위해 개인정보분쟁조정위원회, 한국인터넷진흥원 개인정보해신고센터 등에 분쟁 해결이나 상담을 신청할 수 있습니다.\\n- 개인정보분쟁조정위원회: (국번없이) 1833-6972 (www.kopico.go.kr)\\n- 개인정보침해신고센터: (국번없이) 118 (privacy.kisa.or.kr)\\n- 대검찰청: (국번없이) 1301 (www.spo.go.kr)\\n- 경찰청: (국번없이) 182 (www.police.go.kr)\\n제14조 (개인정보 처리방침의 변경)\\n본 개인정보처리방침은 법령, 정책 또는 보안 기술의 변경에 따라 내용의 추가, 삭제 및 수정이 있을 시, 개정 최소 7일 전에 홈페이지를 통해 사전 공지합니다.\\n\\n부칙\\n제1조 (시행일자)\\n이 개인정보처리방침은 2024년 10월 1일부터 시행됩니다.\\n제2조 (개정 및 고지의 의무)\\n회사는 개인정보처리방침을 변경하는 경우, 변경사항을 시행일자 7일 전부터 서비스 내 공지사항 페이지를 통해 고지할 것입니다. 다만, 이용자의 권리나 의무에 중대한 변경이 발생하는 경우에는 시행일자 30일 전부터 고지합니다.\\n제3조 (유효성)\\n본 개인정보처리방침의 일부 조항이 법적 또는 기타 사유로 인해 무효화되거나 시행할 수 없는 경우, 나머지 조항들은 계속해서 유효합니다. 무효화된 조항은 관련 법령에 부합하는 방식으로 수정되어 효력을 지속합니다.\\n제4조 (변경 통지의 방법)\\n회사는 개인정보처리방침의 변경 시, 다음의 방법으로 이용자에게 고지합니다:\\n- 서비스 초기화면 또는 팝업 공지\\n- 이메일 발송\\n- 회사 홈페이지 공지사항\\n제5조 (비회원의 개인정보 보호)\\n회사는 비회원의 개인정보도 회원과 동일한 수준으로 보호합니다. 비회원이 개인정보 제공을 거부할 경우 일부 서비스 이용에 제한이 있을 수 있습니다.\\n제6조 (14세 미만 아동의 개인정보 보호)\\n회사는 14세 미만 아동의 개인정보를 수집하지 않습니다. 만일 14세 미만 아동의 개인정보가 수집된 경우, 법정 대리인의 동의를 받아야 하며, 법정 대리인의 동의 없이 수집된 경우 이를 지체 없이 파기합니다.\\n제7조 (개인정보의 국외 이전)\\n회사는 이용자의 개인정보를 국외로 이전하지 않으며, 향후 필요한 경우, 사전에 이용자의 동의를 받습니다.\\n제8조 (기타)\\n본 방침에 명시되지 않은 사항은 회사의 내부 방침과 관련 법령에 따릅니다.\\n"
+tos_full = "\\n바론 소프트웨어 이용약관\\n\\n제1장 총칙\\n제1조 (목적)\\n이 약관은 바론컨설턴트(이하 \\\"회사\\\"라 합니다)가 제공하는 바론소프트웨어(이하 \\\"서비스\\\"라 합니다)를 이용함에 있어 회사와 이용자 간의 권리, 의무 및 책임사항과 기타 필요한 사항을 정하는 것을 목적으로 합니다.\\n제2조 (용어의 정의)\\n① 본 약관에서 사용하는 용어의 정의는 다음과 같습니다:\\n- “서비스”란 회사가 제공하는 소프트웨어 및 관련 제반 서비스를 의미합니다.\\n- “이용자”란 회사의 서비스에 접속하여 본 약관에 따라 회사가 제공하는 서비스를 이용하는 회원 및 비회원을 말합니다.\\n- “회원”이란 본 약관에 동의하고 회사와 이용계약을 체결한 자를 의미합니다.\\n- “비회원”이란 회원가입을 하지 않고 회사가 제공하는 일부 서비스를 이용하는 자를 말합니다.\\n제3조 (약관의 효력 및 변경)\\n① 본 약관은 이용자가 본 약관에 동의하고, 회사가 이에 대한 승낙을 완료함으로써 효력이 발생합니다. ② 회사는 필요한 경우 본 약관을 변경할 수 있으며, 변경된 약관은 서비스 화면에 공지된 후 효력이 발생합니다.\\n제4조 (약관 외 준칙)\\n본 약관에 명시되지 않은 사항에 대해서는 대한민국의 관련 법령과 상관습에 따릅니다.\\n제2장 서비스 이용계약\\n제5조 (이용계약의 성립)\\n이용계약은 이용자가 약관의 내용에 동의하고, 회사가 제공하는 소정의 회원가입 신청서를 작성하여 가입을 완료한 후, 회사가 이를 승인함으로써 성립합니다.\\n제6조 (이용계약의 유보와 거절)\\n① 회사는 다음 각 호에 해당하는 경우 이용계약의 성립을 유보하거나 거절할 수 있습니다: - 신청서의 내용이 허위로 판명된 경우 - 서비스 제공이 기술적으로 어려운 경우\\n제7조 (계약사항의 변경)\\n회원은 개인정보 관리 메뉴를 통해 언제든지 자신의 정보를 열람하고 수정할 수 있습니다. 회원의 정보가 변경된 경우 즉시 수정해야 하며, 수정하지 않아 발생하는 문제의 책임은 회원에게 있습니다.\\n제3장 개인정보 보호\\n제8조 (개인정보 보호의 원칙)\\n① 회원의 개인정보는 관련 법령에 따라 보호됩니다. ② 회사는 개인정보 보호와 관련된 세부 사항을 별도로 마련한 개인정보처리방침에 따라 관리하며, 이용자는 언제든지 해당 방침을 통해 개인정보 관리에 대한 자세한 내용을 확인할 수 있습니다.\\n제9조 (개인정보처리방침 준수)\\n① 회사는 개인정보 보호와 관련된 구체적인 사항을 개인정보처리방침에 따라 관리합니다. ② 개인정보의 수집, 이용, 제공, 보관, 보호 등에 관한 사항은 회사의 개인정보처리방침을 따르며, 이용자는 회사 웹사이트에서 이를 확인할 수 있습니다. ③ 회사는 개인정보 보호를 위해 최선을 다하며, 관련 법령에 따라 이용자의 개인정보를 안전하게 관리합니다.\\n제10조 (14세 미만 아동의 개인정보 보호)\\n① 회사는 14세 미만 아동의 개인정보를 수집할 경우, 반드시 법정대리인의 동의를 받아야 합니다. ② 법정대리인은 아동의 개인정보 열람, 수정, 삭제를 요청할 수 있으며, 회사는 이를 신속하게 처리합니다. ③ 14세 미만 아동의 개인정보 보호와 관련된 구체적인 사항은 개인정보처리방침에 명시되어 있습니다.\\n제4장 서비스 제공 및 이용\\n제11조 (서비스 제공)\\n회사는 회원의 이용 신청을 승인한 때부터 서비스를 개시합니다. 서비스 이용은 연중무휴 24시간을 원칙으로 합니다.\\n제12조 (서비스의 변경 및 중단)\\n회사는 서비스 제공이 어려운 경우 사전 고지 후 서비스를 변경하거나 중단할 수 있습니다.\\n제5장 정보 제공 및 광고\\n제13조 (정보 제공 및 광고)\\n① 회사는 서비스 이용 중 필요하다고 인정되는 정보 및 광고를 제공할 수 있습니다. ② 회원은 원치 않는 정보를 수신 거부할 수 있습니다.\\n제6장 게시물 관리\\n제14조 (게시물의 관리)\\n회사는 회원이 게시한 내용이 불법적이거나 약관에 위배될 경우 이를 삭제할 수 있습니다.\\n제15조 (게시물의 저작권)\\n게시물의 저작권은 회원에게 있으며, 회사는 이를 서비스 홍보 및 개선 목적으로 사용할 수 있습니다.\\n제7장 계약 해지 및 이용 제한\\n제16조 (계약 해지)\\n회원은 언제든지 계약 해지를 요청할 수 있으며, 회사는 신속하게 처리합니다.\\n제17조 (이용 제한)\\n회사는 회원이 약관을 위반할 경우 서비스 이용을 제한할 수 있습니다.\\n제8장 손해 배상 및 면책 조항\\n제18조 (손해 배상)\\n회사는 무료로 제공되는 서비스와 관련하여 회원에게 발생한 손해에 대해 책임을 지지 않습니다.\\n제19조 (면책 조항)\\n회사는 천재지변 등 불가항력적인 사유로 인해 서비스를 제공하지 못하는 경우 책임을 지지 않습니다.\\n제9장 유료 서비스\\n20조 (유료 서비스의 이용)\\n① 회사는 회원에게 특정 서비스에 대해 유료로 제공할 수 있습니다. ② 유료 서비스의 이용 요금, 결제 방식, 환불 절차 등에 대한 상세 내용은 서비스 안내 페이지와 결제 화면에 명시합니다. ③ 유료 서비스 이용 요금은 회사가 정한 결제 방식에 따라 결제됩니다. 회원은 신용카드, 계좌이체, 휴대전화 결제 등 회사가 제공하는 다양한 결제 방식을 통해 요금을 납부할 수 있습니다. ④ 유료 서비스의 이용 요금은 선불 결제를 원칙으로 하며, 이용 기간 중 서비스 중지 및 해지 시 남은 이용 기간에 대한 환불은 회사의 환불 정책에 따라 처리됩니다. ⑤ 회사는 회원의 유료 서비스 이용과 관련하여 발생한 문제에 대해 최선을 다해 해결하도록 노력합니다. 다만, 회사의 고의 또는 중대한 과실이 없는 한 회원이 유료 서비스 이용 중 입은 손해에 대해서는 책임을 지지 않습니다.\\n제21조(환불 정책)\\n① 회원은 결제 후 7일 이내에 서비스 이용을 시작하지 않은 경우, 요금 전액을 환불받을 수 있습니다. ② 유료 서비스 이용 중 부득이한 사유로 서비스가 중지된 경우, 회사는 이용하지 않은 부분에 대해 환불 절차를 밟습니다. ③ 회원의 귀책사유로 인해 서비스 이용이 중지된 경우, 환불이 불가능합니다. ④ 환불은 회원이 지정한 계좌로 환불 절차를 거치며, 환불 요청 후 7일 이내에 처리됩니다.\\n제22조 (유료 서비스의 중지 및 해지)\\n① 회원이 유료 서비스를 해지하고자 하는 경우, 회사의 고객 지원 센터에 해지 신청을 해야 합니다. ② 회사는 회원이 약관을 위반하거나 부정한 방법으로 유료 서비스를 이용한 경우, 유료 서비스 이용을 즉시 중지하고 계약을 해지할 수 있습니다.\\n제10장 양도 금지\\n제23조 (양도 금지)\\n회원은 서비스 이용권한, 기타 이용계약상의 지위를 제3자에게 양도, 증여할 수 없으며, 이를 담보로 제공할 수 없습니다.\\n제11장 관할 법원\\n제24조 (분쟁 해결)\\n서비스 이용과 관련하여 분쟁이 발생한 경우, 회사와 회원은 성실히 협의하여 해결합니다.\\n제25조 (관할 법원)\\n본 약관에 따른 분쟁은 서울중앙지방법원을 관할 법원으로 합니다.\\n부칙\\n본 약관은 2024년 10월 1일부터 시행됩니다.\\n"
+
+[msg.userfront.signup.agreement]
+title = "Title"
+
+[msg.userfront.signup.auth]
+affiliate_notice = "Affiliate Notice"
+title = "Title"
+
+[msg.userfront.signup.email]
+code_mismatch = "Code Mismatch"
+duplicate = "Duplicate"
+invalid = "Invalid"
+send_failed = "Send Failed"
+verified = "Verified"
+verify_failed = "Verify Failed"
+
+[msg.userfront.signup.password]
+length_required = "Length Required"
+lowercase_required = "Lowercase Required"
+mismatch = "Mismatch"
+number_required = "Number Required"
+symbol_required = "Symbol Required"
+title = "Title"
+uppercase_required = "Uppercase Required"
+
+[msg.userfront.signup.password.rule]
+lowercase = "Lowercase"
+min_length = "Min Length"
+min_types = "Min Types"
+number = "Number"
+symbol = "Symbol"
+uppercase = "Uppercase"
+
+[msg.userfront.signup.phone]
+code_mismatch = "Code Mismatch"
+send_failed = "Send Failed"
+verified = "Verified"
+verify_failed = "Verify Failed"
+
+[msg.userfront.signup.policy]
+loading = "Loading"
+lowercase = "Lowercase"
+min_length = "Min Length"
+min_types = "Min Types"
+number = "Number"
+summary = "Summary"
+symbol = "Symbol"
+uppercase = "Uppercase"
+
+[msg.userfront.signup.profile]
+affiliate_hint = "Affiliate Hint"
+title = "Title"
+
+[msg.userfront.signup.success]
+body = "Body"
+title = "Title"
+
+[ui.common]
+add = "Add"
+back = "Back"
+cancel = "Cancel"
+close = "Close"
+collapse = "Collapse"
+confirm = "Confirm"
+copy = "Copy"
+create = "Create"
+delete = "Delete"
+details = "Details"
+edit = "Edit"
+hyphen = "-"
+na = "N/A"
+never = "Never"
+next = "Next"
+page_of = "Page {page} of {total}"
+prev = "Prev"
+previous = "Previous"
+qr = "QR"
+read_only = "Read Only"
+refresh = "Refresh"
+requesting = "Requesting"
+resend = "Resend"
+retry = "Retry"
+save = "Save"
+search = "Search"
+show_more = "Show More"
+language = "Language"
+language_ko = "Korean"
+language_en = "English"
+theme_dark = "Dark"
+theme_light = "Light"
+theme_toggle = "Theme Toggle"
+unknown = "Unknown"
+
+[ui.common.badge]
+admin_only = "Admin only"
+command_only = "Command only"
+system = "System"
+
+[ui.common.role]
+admin = "Admin"
+user = "User"
+
+[ui.common.status]
+active = "Active"
+blocked = "Blocked"
+failure = "Failure"
+inactive = "Inactive"
+ok = "Ok"
+pending = "Pending"
+success = "Success"
+
+[ui.userfront]
+app_title = "Baron SW Portal"
+
+[ui.userfront.app_label]
+admin_console = "Admin Console"
+baron = "Baron"
+dev_console = "Dev Console"
+
+[ui.userfront.audit]
+
+[ui.userfront.audit.table]
+app = "App"
+auth_method = "Auth Method"
+date = "Date"
+device = "Device"
+ip = "IP"
+pending = "Pending"
+result = "Result"
+session_id = "Session ID"
+status = "Status"
+
+[ui.userfront.auth_method]
+ory = "Ory"
+session = "Session"
+
+[ui.userfront.dashboard]
+last_auth_label = "Last Auth Label"
+status_history = "Status History"
+
+[ui.userfront.dashboard.activity]
+linked = "Linked"
+
+[ui.userfront.dashboard.approved_session]
+default = "Default"
+userfront = "Userfront"
+
+[ui.userfront.dashboard.revoke]
+confirm_button = "Confirm Button"
+title = "Title"
+
+[ui.userfront.dashboard.scopes]
+title = "Permission (Scopes)"
+
+[ui.userfront.dashboard.status]
+revoked = "Revoked"
+
+[ui.userfront.device]
+android = "Mobile(Android)"
+ios = "Mobile(iOS)"
+linux = "Desktop(Linux)"
+macos = "Desktop(macOS)"
+windows = "Desktop(Windows)"
+
+[ui.userfront.error]
+go_home = "Go Home"
+go_login = "Go Login"
+
+[ui.userfront.forgot]
+heading = "Heading"
+input_label = "Input Label"
+submit = "Submit"
+title = "Title"
+
+[ui.userfront.login]
+forgot_password = "Forgot Password"
+signup = "Signup"
+
+[ui.userfront.login.action]
+submit = "Submit"
+
+[ui.userfront.login.field]
+login_id = "Emain or Phone Number"
+password = "Password"
+
+[ui.userfront.login.link]
+action_label = "Action Label"
+code_only = "Code Only"
+page_title = "Page Title"
+resend_with_time = "Resend With Time"
+send = "Send"
+title = "Title"
+
+[ui.userfront.login.qr]
+expired = "Expired"
+refresh = "Refresh"
+remaining = "Remaining: {time}"
+
+[ui.userfront.login.short_code]
+digits = "Digits"
+expire_time = "Expire Time"
+prefix = "Prefix"
+submit = "Submit"
+
+[ui.userfront.login.tabs]
+link = "Link/Code"
+password = "Password"
+qr = "QR Code"
+
+[ui.userfront.login.unregistered]
+action = "Action"
+title = "Title"
+
+[ui.userfront.login.verification]
+action_label = "Confirm"
+page_title = "Page Title"
+title = "Title"
+
+[ui.userfront.login_success]
+later = "Later"
+qr = "QR"
+title = "Title"
+
+[ui.userfront.nav]
+dashboard = "Dashboard"
+logout = "Logout"
+profile = "Profile"
+qr_scan = "QR Scan"
+
+[ui.userfront.profile]
+department_empty = "Department Empty"
+manage = "Manage"
+user_fallback = "User"
+
+[ui.userfront.profile.field]
+affiliation = "Affiliation"
+company_code = "Company Code"
+department = "Department"
+email = "Email"
+name = "Name"
+tenant = "Tenant"
+
+[ui.userfront.profile.password]
+change = "Change"
+confirm = "Confirm"
+current = "Current"
+forgot = "Forgot"
+new = "New"
+title = "Title"
+
+[ui.userfront.profile.phone]
+code_hint = "Code Hint"
+request_code = "Request Code"
+title = "Phone number"
+
+[ui.userfront.profile.section]
+basic = "Basic"
+organization = "Organization"
+security = "Security"
+
+[ui.userfront.qr]
+request_permission = "Request Permission"
+rescan = "Rescan"
+result_failure = "Result Failure"
+result_success = "Result Success"
+title = "Scan QR Code"
+
+[ui.userfront.reset]
+confirm_password = "Confirm Password"
+new_password = "New Password"
+submit = "Submit"
+subtitle = "Subtitle"
+title = "Title"
+
+[ui.userfront.sections]
+apps = "Apps"
+audit = "Audit"
+
+[ui.userfront.session]
+active = "Active"
+unknown = "Unknown"
+
+[ui.userfront.signup]
+complete = "Complete"
+next_step = "Next Step"
+title = "Title"
+
+[ui.userfront.signup.agreement]
+all = "All"
+privacy_title = "Privacy Title"
+tos_title = "Tos Title"
+
+[ui.userfront.signup.auth]
+code_label = "Code Label"
+request_code = "Request Code"
+
+[ui.userfront.signup.auth.email]
+label = "Label"
+title = "Title"
+
+[ui.userfront.signup.password]
+confirm_label = "Password Confirm"
+label = "Password"
+
+[ui.userfront.signup.phone]
+label = "Label"
+title = "Title"
+
+[ui.userfront.signup.profile]
+affiliation_type = "Affiliation Type"
+company = "Company"
+department = "Department"
+department_optional = "Department Optional"
+name = "Name"
+
+[ui.userfront.signup.steps]
+agreement = "Agreement"
+password = "Password"
+profile = "Profile"
+verify = "Verify"
+
+[ui.userfront.signup.success]
+action = "Action"
diff --git a/userfront/assets/translations/ko.toml b/userfront/assets/translations/ko.toml
new file mode 100644
index 00000000..9b67b361
--- /dev/null
+++ b/userfront/assets/translations/ko.toml
@@ -0,0 +1,536 @@
+[err.userfront]
+
+[err.userfront.auth_proxy]
+consent_accept = "동의 처리에 실패했습니다."
+consent_fetch = "동의 정보를 가져오지 못했습니다."
+consent_reject = "동의 거부에 실패했습니다."
+linked_app_revoke = "연동 해지에 실패했습니다."
+login_failed = "로그인에 실패했습니다."
+oidc_accept = "OIDC 로그인 승인에 실패했습니다."
+password_reset_complete = "비밀번호 재설정에 실패했습니다."
+password_reset_init = "비밀번호 재설정을 시작하지 못했습니다."
+
+[err.userfront.profile]
+load_failed = "프로필을 불러오지 못했습니다: {error}"
+password_change_failed = "비밀번호 변경에 실패했습니다: {error}"
+send_code_failed = "인증번호 전송 실패: {error}"
+update_failed = "프로필 업데이트에 실패했습니다: {error}"
+verify_code_failed = "인증 실패: {error}"
+
+[err.userfront.session]
+missing = "활성 세션이 없습니다."
+
+[msg.userfront]
+greeting = "안녕하세요, {name}님"
+
+[msg.userfront.audit]
+date = "접속일자: {value}"
+device = "접속환경: {value}"
+end = "더 이상 항목이 없습니다."
+ip = "접속 IP: {value}"
+load_more_error = "더 불러오지 못했습니다."
+result = "인증결과: {value}"
+session_id = "Session ID: {value}"
+status = "현황: (준비중)"
+
+[msg.userfront.dashboard]
+approved_device = "승인 기기: {device}"
+approved_ip = "승인 IP: {ip}"
+audit_empty = "최근 접속 이력이 없습니다."
+audit_load_error = "접속이력을 불러오지 못했습니다."
+auth_method = "인증수단: {method}"
+client_id = "Client ID: {id}"
+client_id_missing = "Client ID 없음"
+current_status = "현재 상태: {status}"
+last_auth = "최근 인증: {value}"
+link_missing = "이동할 페이지 주소(Client URI)가 설정되지 않았습니다."
+link_open_error = "해당 링크를 열 수 없습니다."
+session_id_copied = "세션 ID가 복사되었습니다."
+
+[msg.userfront.dashboard.activities]
+empty = "연동된 앱이 없습니다."
+empty_detail = "앱을 연동하면 최근 활동과 상태가 표시됩니다."
+error = "연동 정보를 불러오지 못했습니다."
+
+[msg.userfront.dashboard.approved_session]
+copy_click = "{label}: {id}\\\\\\\\n클릭하면 복사됩니다."
+copy_tap = "{label}: {id}\\\\\\\\n탭하면 복사됩니다."
+none = "{label} 없음"
+
+[msg.userfront.dashboard.revoke]
+confirm = "{app} 앱과의 연동을 해지하시겠습니까?\\\\\\\\n해지하면 다음 로그인 시 다시 동의가 필요합니다."
+error = "해지 실패: {error}"
+success = "{app} 연동이 해지되었습니다."
+
+[msg.userfront.dashboard.scopes]
+empty = "요청된 권한이 없습니다."
+
+[msg.userfront.dashboard.timeline]
+load_error = "접속이력을 불러오지 못했습니다."
+
+[msg.userfront.error]
+detail_contact = "msg.userfront.error.detail_contact"
+detail_generic = "오류가 발생했습니다."
+detail_request = "요청을 처리하는 중 문제가 발생했습니다."
+id = "오류 ID: {id}"
+title = "인증 과정에서 오류가 발생했습니다"
+title_generic = "오류가 발생했습니다"
+title_with_code = "오류: {code}"
+type = "오류 종류: {type}"
+
+[msg.userfront.error.whitelist]
+settings_disabled = "현재 계정 설정 화면은 준비 중입니다."
+
+[msg.userfront.forgot]
+description = "계정과 연결된 이메일 주소 또는 휴대폰 번호를 입력하시면, 비밀번호를 재설정할 수 있는 링크를 보내드립니다."
+dry_send = "drySend 모드: 실제 이메일/SMS는 발송되지 않습니다."
+error = "전송에 실패했습니다: {error}"
+input_required = "이메일 또는 휴대폰 번호를 입력해주세요."
+sent = "비밀번호 재설정 링크가 전송되었습니다. 이메일 또는 SMS를 확인해주세요."
+
+[msg.userfront.login]
+cookie_check_failed = "로그인 확인 실패: {error}"
+dry_send = "drySend 모드: 실제 이메일/SMS는 발송되지 않습니다."
+link_failed = "오류: {error}"
+link_send_failed = "전송 실패: {error}"
+link_sent_email = "입력하신 이메일로 로그인 링크를 보냈습니다."
+link_sent_phone = "입력하신 번호로 로그인 링크를 보냈습니다."
+link_timeout = "시간이 경과되었습니다."
+no_account = "계정이 없으신가요?"
+oidc_failed = "OIDC 로그인 처리에 실패했습니다. 다시 시도해 주세요."
+qr_expired = "시간이 경과되었습니다."
+qr_init_failed = "QR 초기화에 실패했습니다: {error}"
+qr_login_required = "로그인 한 상태여야 QR 스캔으로 로그인 할 수 있습니다"
+token_missing = "로그인 토큰을 확인할 수 없습니다."
+verification_failed = "승인 처리에 실패했습니다: {error}"
+
+[msg.userfront.login.link]
+approved = "링크로 로그인 되었습니다. 잠시 후 로그인 화면으로 이동합니다."
+helper = "입력하신 정보로 로그인 링크를 전송합니다."
+missing_login_id = "이메일 또는 휴대폰 번호를 입력해 주세요."
+missing_phone = "휴대폰 번호를 입력해 주세요."
+resend_wait = "재발송은 {time} 후 가능합니다."
+short_code_help = "링크로 받은 값의 뒤 문자 2개와 숫자 6자리를 입력하셔도 로그인 할 수 있습니다."
+
+[msg.userfront.login.password]
+failed = "로그인 실패: {error}"
+missing_credentials = "이메일(또는 전화번호)와 비밀번호를 모두 입력해주세요."
+
+[msg.userfront.login.qr]
+load_failed = "QR 코드를 불러오지 못했습니다."
+scan_hint = "모바일 앱으로 스캔하세요"
+
+[msg.userfront.login.short_code]
+invalid = "문자 2개와 숫자 6자리를 입력해 주세요."
+
+[msg.userfront.login.unregistered]
+body = "가입되지 않은 정보입니다.\\\\n회원가입 후 이용해 주세요."
+
+[msg.userfront.login.verification]
+approved = "승인되었습니다. 로그인은 요청하신 창에서 완료됩니다."
+approved_local = "승인 되었습니다. 이 기기는 로그인되어 있는 상태입니다. 원격 창도 로그인이 될 예정입니다"
+success = "로그인 승인에 성공했습니다."
+
+[msg.userfront.login_success]
+subtitle = "성공적으로 로그인되었습니다."
+
+[msg.userfront.profile]
+department_missing = "소속 정보 없음"
+department_required = "소속을 입력해주세요."
+email_missing = "이메일 없음"
+greeting = "안녕하세요, {name}님"
+load_failed = "정보를 불러올 수 없습니다."
+name_missing = "이름 없음"
+name_required = "이름을 입력해주세요."
+phone_required = "휴대폰 번호를 입력해주세요."
+phone_verify_required = "휴대폰 번호 인증이 필요합니다."
+update_failed = "수정 실패: {error}"
+update_success = "정보가 수정되었습니다."
+
+[msg.userfront.profile.password]
+change_failed = "비밀번호 변경 실패: {error}"
+changed = "비밀번호가 변경되었습니다."
+current_required = "현재 비밀번호를 입력해 주세요."
+mismatch = "새 비밀번호가 일치하지 않습니다."
+new_required = "새 비밀번호를 입력해 주세요."
+subtitle = "현재 비밀번호 확인 후 새 비밀번호로 변경합니다."
+
+[msg.userfront.profile.phone]
+code_sent = "인증번호가 전송되었습니다."
+send_failed = "전송 실패: {error}"
+verified = "인증되었습니다."
+verify_failed = "인증 실패: {error}"
+verify_notice = "휴대폰 번호를 변경하려면 SMS 인증이 필요합니다."
+
+[msg.userfront.profile.section]
+basic = "계정 기본 정보를 관리합니다."
+organization = "소속 및 구분 정보입니다."
+security = "비밀번호를 안전하게 관리합니다."
+
+[msg.userfront.qr]
+approve_error = "QR 승인 실패: {error}"
+approve_success = "QR 승인 완료! PC 화면에서 로그인이 진행됩니다."
+camera_error = "카메라 오류: {error}"
+permission_error = "카메라 권한 요청에 실패했습니다. 브라우저/OS 설정을 확인해주세요."
+permission_required = "카메라 권한이 필요합니다."
+
+[msg.userfront.reset]
+invalid_body = "비밀번호 재설정 링크가 만료되었거나 잘못되었습니다. 다시 시도해주세요."
+invalid_link = "유효하지 않은 재설정 링크입니다. (loginId/token 누락)"
+invalid_title = "유효하지 않은 링크입니다."
+policy_loading = "비밀번호 정책을 불러오는 중입니다..."
+success = "비밀번호가 성공적으로 변경되었습니다. 다시 로그인해주세요."
+
+[msg.userfront.reset.error]
+empty_password = "비밀번호를 입력해주세요."
+generic = "비밀번호 변경에 실패했습니다: {error}"
+lowercase = "최소 1개 이상의 소문자를 포함해야 합니다."
+min_length = "비밀번호는 최소 {count}자 이상이어야 합니다."
+min_types = "비밀번호는 영문 대/소문자/숫자/특수문자 중 {count}가지 이상 포함해야 합니다."
+mismatch = "비밀번호가 일치하지 않습니다."
+number = "최소 1개 이상의 숫자를 포함해야 합니다."
+symbol = "최소 1개 이상의 특수문자를 포함해야 합니다."
+uppercase = "최소 1개 이상의 대문자를 포함해야 합니다."
+
+[msg.userfront.reset.policy]
+lowercase = "소문자 1개 이상"
+min_length = "최소 {count}자 이상"
+min_types = "영문 대/소문자/숫자/특수문자 중 {count}가지 이상"
+number = "숫자 1개 이상"
+symbol = "특수문자 1개 이상"
+uppercase = "대문자 1개 이상"
+
+[msg.userfront.sections]
+apps_subtitle = "현재 연결된 앱과 최근 인증 상태입니다."
+audit_subtitle = "Baron 로그인 기준의 최근 접근 기록입니다."
+
+[msg.userfront.settings]
+disabled = "현재 계정 설정 화면은 준비 중입니다."
+
+[msg.userfront.signup]
+failed = "가입 실패: {error}"
+privacy_full = "\\n개인정보 수집 및 이용 동의\\n\\n바론서비스 개인정보처리방침\\n\\n제1조 (목적)\\n바론컨설턴트(이하 \\\"회사\\\")는 바론서비스(이하 \\\"서비스\\\")를 이용하는 고객(이하 \\\"이용자\\\")의 개인정보를 보호하고, 「개인정보 보호법」에 따라 책임과 의무를 다하기 위해 본 개인정보처리방침을 마련했습니다. 본 방침은 이용자가 제공한 개인정보가 어떻게 수집, 이용, 보관, 보호되는지를 설명합니다.\\n제2조 (개인정보의 처리목적)\\n회사는 다음의 목적을 위해 개인정보를 처리합니다. 처리하고 있는 개인정보는 다음의 목적 이외의 용도로는 이용되지 않으며, 이용 목적이 변경되는 경우에는 「개인정보 보호법」 제18조에 따라 별도의 동의를 받는 등 필요한 조치를 이행할 예정입니다.\\n- 본인확인: 회원가입 및 관리를 위한 본인 확인, 전화 또는 이메일을 통한 연락\\n- 서비스 제공: 각종 통보 및 서비스 제공을 위한 업무 처리\\n- 제품소개서 다운로드: 설명자료 전달\\n- 상담 및 데모 신청: 상담 제공 및 데모 제공, 계약 처리자 정보 수집\\n- 행사 참가 신청: 참석 안내 및 세미나/설명회/교육 제공\\n- 보안가이드 제공: 안내자료 전달\\n- 기술지원 문의: 서비스 사용 지원\\n- 서비스 개선 의견 접수: 서비스 품질 개선\\n- 마케팅 활동: 동의한 고객에 한해 뉴스레터 및 매거진 발송\\n제3조 (개인정보의 처리 및 보유 기간)\\n① 회사는 법령에 따른 개인정보 보유 및 이용기간 또는 정보주체로부터 개인정보를 수집 시 동의받은 개인정보 보유 및 이용기간 내에서 개인정보를 처리 및 보유합니다.\\n② 각각의 개인정보 처리 및 보유 기간은 다음과 같습니다:\\n- 회원정보: 회원가입일부터 회원탈퇴 후 1년까지\\n- 홍보, 상담, 계약용 개인정보: 2년\\n제4조 (개인정보의 제3자 제공)\\n① 회사는 정보주체의 개인정보를 제2조에서 명시한 범위 내에서만 처리하며, 정보 주체의 동의, 법률의 특별한 규정 등 「개인정보 보호법」 제17조 및 제18조에 해당하는 경우에만 개인정보를 제3자에게 제공합니다.\\n② 회사는 다음과 같이 개인정보를 제3자에게 제공하고 있습니다:\\n- 제공받는 자: 수사기관 및 유관기관, 피신고업체\\n- 이용 목적: 개인정보 침해 민원 처리\\n- 제공하는 개인정보 항목: 성명, 연락처, 이메일\\n- 보유 및 이용기간: 법령에서 정한 보존기간 및 제공목적 달성 시 파기\\n제5조 (개인정보 처리 위탁)\\n① 회사는 개인정보 처리업무를 외부 업체에 위탁하지 않으며, 자체적으로 처리하고 있습니다.\\n② 회사가 특정 업무(예: 채용 업무)를 외부 업체에 위탁할 경우, 개인정보 처리방침 시행 전 회사 홈페이지에서 공지한 후 정보주체의 동의를 받은 후 위탁합니다.\\n제6조 (정보주체의 권리·의무 및 행사 방법)\\n① 정보주체는 회사에 대해 언제든지 개인정보 열람, 정정, 삭제, 처리정지 요구 등의 권리를 행사할 수 있습니다.\\n② 권리 행사는 다음과 같은 방법으로 할 수 있습니다:\\n- 서면: 회사 주소로 서면 제출\\n- 전자우편: 회사 이메일로 요청\\n- 모사전송(FAX): 회사 FAX로 요청\\n③ 권리 행사는 정보주체의 법정대리인이나 위임을 받은 자를 통해 대리로도 가능합니다. 이 경우 “개인정보 처리 방법에 관한 고시” 별지 제11호 서식에 따른 위임장을 제출해야 합니다.\\n④ 개인정보 열람 및 처리정지 요구는 「개인정보 보호법」 제35조 제4항, 제37조 제2항에 따라 제한될 수 있습니다.\\n⑤ 개인정보의 정정 및 삭제 요구는 다른 법령에 따라 수집된 개인정보인 경우 제한될 수 있습니다.\\n⑥ 회사는 권리 행사를 요청한 자가 본인 또는 정당한 대리인인지를 확인합니다.\\n제7조 (처리하는 개인정보의 항목)\\n회사는 다음의 개인정보 항목을 처리합니다:\\n- 수집 항목:\\n- 필수 항목: 성명, 휴대전화번호, 이메일\\n- 선택 항목: 회사전화번호, 문의사항\\n- 수집 방법:\\n- 홈페이지, 전화, 이메일을 통해 수집\\n제8조 (개인정보의 파기)\\n① 회사는 개인정보 보유 기간의 경과, 처리 목적 달성 등 개인정보가 불필요하게 되었을 때 지체 없이 해당 개인정보를 파기합니다.\\n② 정보주체로부터 동의받은 개인정보 보유 기간이 경과하거나 처리 목적이 달성된 경우에도 다른 법령에 따라 개인정보를 계속 보존해야 할 경우에는, 해당 개인정보를 별도의 데이터베이스(DB)로 옮기거나 보관 장소를 달리하여 보존합니다.\\n③ 개인정보 파기의 절차 및 방법은 다음과 같습니다:\\n- 파기 절차: 회사는 파기 사유가 발생한 개인정보를 선정하고, 개인정보 보호책임자의 승인을 받아 개인정보를 파기합니다.\\n- 파기 방법: 전자적 파일 형태로 기록된 개인정보는 복구할 수 없도록 기술적 방법을 사용해 삭제하며, 종이 문서에 기록된 개인정보는 분쇄기로 분쇄하거나 소각하여 파기합니다.\\n제9조 (개인정보의 안전성 확보 조치)\\n회사는 개인정보의 안전성 확보를 위해 다음과 같은 조치를 취합니다:\\n- 관리적 조치: 내부관리계획 수립·시행, 정기적 직원 교육\\n- 기술적 조치: 개인정보처리시스템 접근 권한 관리, 접근통제시스템 설치, 고유식별정보 암호화, 보안 프로그램 설치\\n- 물리적 조치: 전산실 및 자료보관실 접근 통제\\n제10조 (개인정보 자동 수집 장치의 설치·운영 및 거부에 관한 사항)\\n회사는 쿠키(Cookie)를 사용하지 않습니다. 쿠키는 이용자의 이용 정보를 저장하고 수시로 불러오는 작은 파일로, 바론서비스에서는 쿠키를 사용하지 않습니다.\\n제11조 (개인정보 보호책임자)\\n회사는 개인정보 처리에 관한 업무를 총괄하여 책임지고, 개인정보 처리와 관련된 정보주체의 불만처리 및 피해구제를 위해 개인정보 보호책임자를 지정하고 있습니다.\\n개인정보 보호책임자:\\n- 성명: 염승호\\n- 직책: 수석연구원\\n- 연락처: 02-2141-7448\\n- 팩스번호: 02-2141-7599\\n- 이메일: b23008@baroncs.co.kr\\n제12조 (개인정보 열람청구)\\n정보주체는 「개인정보 보호법」 제35조에 따른 개인정보 열람 청구를 아래 부서에 할 수 있습니다. 회사는 정보주체의 개인정보 열람청구가 신속하게 처리되도록 노력하겠습니다.\\n개인정보 열람청구 접수·처리 부서:\\n- 부서명: 총괄기획실\\n- 담당자: 권혁진\\n- 연락처: 02-2141-7465\\n- 팩스번호: 02-2141-7599\\n- 이메일: baroncs@baroncs.co.kr\\n제13조 (권익침해 구제방법)\\n정보주체는 개인정보 침해로 인한 구제를 위해 개인정보분쟁조정위원회, 한국인터넷진흥원 개인정보해신고센터 등에 분쟁 해결이나 상담을 신청할 수 있습니다.\\n- 개인정보분쟁조정위원회: (국번없이) 1833-6972 (www.kopico.go.kr)\\n- 개인정보침해신고센터: (국번없이) 118 (privacy.kisa.or.kr)\\n- 대검찰청: (국번없이) 1301 (www.spo.go.kr)\\n- 경찰청: (국번없이) 182 (www.police.go.kr)\\n제14조 (개인정보 처리방침의 변경)\\n본 개인정보처리방침은 법령, 정책 또는 보안 기술의 변경에 따라 내용의 추가, 삭제 및 수정이 있을 시, 개정 최소 7일 전에 홈페이지를 통해 사전 공지합니다.\\n\\n부칙\\n제1조 (시행일자)\\n이 개인정보처리방침은 2024년 10월 1일부터 시행됩니다.\\n제2조 (개정 및 고지의 의무)\\n회사는 개인정보처리방침을 변경하는 경우, 변경사항을 시행일자 7일 전부터 서비스 내 공지사항 페이지를 통해 고지할 것입니다. 다만, 이용자의 권리나 의무에 중대한 변경이 발생하는 경우에는 시행일자 30일 전부터 고지합니다.\\n제3조 (유효성)\\n본 개인정보처리방침의 일부 조항이 법적 또는 기타 사유로 인해 무효화되거나 시행할 수 없는 경우, 나머지 조항들은 계속해서 유효합니다. 무효화된 조항은 관련 법령에 부합하는 방식으로 수정되어 효력을 지속합니다.\\n제4조 (변경 통지의 방법)\\n회사는 개인정보처리방침의 변경 시, 다음의 방법으로 이용자에게 고지합니다:\\n- 서비스 초기화면 또는 팝업 공지\\n- 이메일 발송\\n- 회사 홈페이지 공지사항\\n제5조 (비회원의 개인정보 보호)\\n회사는 비회원의 개인정보도 회원과 동일한 수준으로 보호합니다. 비회원이 개인정보 제공을 거부할 경우 일부 서비스 이용에 제한이 있을 수 있습니다.\\n제6조 (14세 미만 아동의 개인정보 보호)\\n회사는 14세 미만 아동의 개인정보를 수집하지 않습니다. 만일 14세 미만 아동의 개인정보가 수집된 경우, 법정 대리인의 동의를 받아야 하며, 법정 대리인의 동의 없이 수집된 경우 이를 지체 없이 파기합니다.\\n제7조 (개인정보의 국외 이전)\\n회사는 이용자의 개인정보를 국외로 이전하지 않으며, 향후 필요한 경우, 사전에 이용자의 동의를 받습니다.\\n제8조 (기타)\\n본 방침에 명시되지 않은 사항은 회사의 내부 방침과 관련 법령에 따릅니다.\\n"
+tos_full = "\\n바론 소프트웨어 이용약관\\n\\n제1장 총칙\\n제1조 (목적)\\n이 약관은 바론컨설턴트(이하 \\\"회사\\\"라 합니다)가 제공하는 바론소프트웨어(이하 \\\"서비스\\\"라 합니다)를 이용함에 있어 회사와 이용자 간의 권리, 의무 및 책임사항과 기타 필요한 사항을 정하는 것을 목적으로 합니다.\\n제2조 (용어의 정의)\\n① 본 약관에서 사용하는 용어의 정의는 다음과 같습니다:\\n- “서비스”란 회사가 제공하는 소프트웨어 및 관련 제반 서비스를 의미합니다.\\n- “이용자”란 회사의 서비스에 접속하여 본 약관에 따라 회사가 제공하는 서비스를 이용하는 회원 및 비회원을 말합니다.\\n- “회원”이란 본 약관에 동의하고 회사와 이용계약을 체결한 자를 의미합니다.\\n- “비회원”이란 회원가입을 하지 않고 회사가 제공하는 일부 서비스를 이용하는 자를 말합니다.\\n제3조 (약관의 효력 및 변경)\\n① 본 약관은 이용자가 본 약관에 동의하고, 회사가 이에 대한 승낙을 완료함으로써 효력이 발생합니다. ② 회사는 필요한 경우 본 약관을 변경할 수 있으며, 변경된 약관은 서비스 화면에 공지된 후 효력이 발생합니다.\\n제4조 (약관 외 준칙)\\n본 약관에 명시되지 않은 사항에 대해서는 대한민국의 관련 법령과 상관습에 따릅니다.\\n제2장 서비스 이용계약\\n제5조 (이용계약의 성립)\\n이용계약은 이용자가 약관의 내용에 동의하고, 회사가 제공하는 소정의 회원가입 신청서를 작성하여 가입을 완료한 후, 회사가 이를 승인함으로써 성립합니다.\\n제6조 (이용계약의 유보와 거절)\\n① 회사는 다음 각 호에 해당하는 경우 이용계약의 성립을 유보하거나 거절할 수 있습니다: - 신청서의 내용이 허위로 판명된 경우 - 서비스 제공이 기술적으로 어려운 경우\\n제7조 (계약사항의 변경)\\n회원은 개인정보 관리 메뉴를 통해 언제든지 자신의 정보를 열람하고 수정할 수 있습니다. 회원의 정보가 변경된 경우 즉시 수정해야 하며, 수정하지 않아 발생하는 문제의 책임은 회원에게 있습니다.\\n제3장 개인정보 보호\\n제8조 (개인정보 보호의 원칙)\\n① 회원의 개인정보는 관련 법령에 따라 보호됩니다. ② 회사는 개인정보 보호와 관련된 세부 사항을 별도로 마련한 개인정보처리방침에 따라 관리하며, 이용자는 언제든지 해당 방침을 통해 개인정보 관리에 대한 자세한 내용을 확인할 수 있습니다.\\n제9조 (개인정보처리방침 준수)\\n① 회사는 개인정보 보호와 관련된 구체적인 사항을 개인정보처리방침에 따라 관리합니다. ② 개인정보의 수집, 이용, 제공, 보관, 보호 등에 관한 사항은 회사의 개인정보처리방침을 따르며, 이용자는 회사 웹사이트에서 이를 확인할 수 있습니다. ③ 회사는 개인정보 보호를 위해 최선을 다하며, 관련 법령에 따라 이용자의 개인정보를 안전하게 관리합니다.\\n제10조 (14세 미만 아동의 개인정보 보호)\\n① 회사는 14세 미만 아동의 개인정보를 수집할 경우, 반드시 법정대리인의 동의를 받아야 합니다. ② 법정대리인은 아동의 개인정보 열람, 수정, 삭제를 요청할 수 있으며, 회사는 이를 신속하게 처리합니다. ③ 14세 미만 아동의 개인정보 보호와 관련된 구체적인 사항은 개인정보처리방침에 명시되어 있습니다.\\n제4장 서비스 제공 및 이용\\n제11조 (서비스 제공)\\n회사는 회원의 이용 신청을 승인한 때부터 서비스를 개시합니다. 서비스 이용은 연중무휴 24시간을 원칙으로 합니다.\\n제12조 (서비스의 변경 및 중단)\\n회사는 서비스 제공이 어려운 경우 사전 고지 후 서비스를 변경하거나 중단할 수 있습니다.\\n제5장 정보 제공 및 광고\\n제13조 (정보 제공 및 광고)\\n① 회사는 서비스 이용 중 필요하다고 인정되는 정보 및 광고를 제공할 수 있습니다. ② 회원은 원치 않는 정보를 수신 거부할 수 있습니다.\\n제6장 게시물 관리\\n제14조 (게시물의 관리)\\n회사는 회원이 게시한 내용이 불법적이거나 약관에 위배될 경우 이를 삭제할 수 있습니다.\\n제15조 (게시물의 저작권)\\n게시물의 저작권은 회원에게 있으며, 회사는 이를 서비스 홍보 및 개선 목적으로 사용할 수 있습니다.\\n제7장 계약 해지 및 이용 제한\\n제16조 (계약 해지)\\n회원은 언제든지 계약 해지를 요청할 수 있으며, 회사는 신속하게 처리합니다.\\n제17조 (이용 제한)\\n회사는 회원이 약관을 위반할 경우 서비스 이용을 제한할 수 있습니다.\\n제8장 손해 배상 및 면책 조항\\n제18조 (손해 배상)\\n회사는 무료로 제공되는 서비스와 관련하여 회원에게 발생한 손해에 대해 책임을 지지 않습니다.\\n제19조 (면책 조항)\\n회사는 천재지변 등 불가항력적인 사유로 인해 서비스를 제공하지 못하는 경우 책임을 지지 않습니다.\\n제9장 유료 서비스\\n20조 (유료 서비스의 이용)\\n① 회사는 회원에게 특정 서비스에 대해 유료로 제공할 수 있습니다. ② 유료 서비스의 이용 요금, 결제 방식, 환불 절차 등에 대한 상세 내용은 서비스 안내 페이지와 결제 화면에 명시합니다. ③ 유료 서비스 이용 요금은 회사가 정한 결제 방식에 따라 결제됩니다. 회원은 신용카드, 계좌이체, 휴대전화 결제 등 회사가 제공하는 다양한 결제 방식을 통해 요금을 납부할 수 있습니다. ④ 유료 서비스의 이용 요금은 선불 결제를 원칙으로 하며, 이용 기간 중 서비스 중지 및 해지 시 남은 이용 기간에 대한 환불은 회사의 환불 정책에 따라 처리됩니다. ⑤ 회사는 회원의 유료 서비스 이용과 관련하여 발생한 문제에 대해 최선을 다해 해결하도록 노력합니다. 다만, 회사의 고의 또는 중대한 과실이 없는 한 회원이 유료 서비스 이용 중 입은 손해에 대해서는 책임을 지지 않습니다.\\n제21조(환불 정책)\\n① 회원은 결제 후 7일 이내에 서비스 이용을 시작하지 않은 경우, 요금 전액을 환불받을 수 있습니다. ② 유료 서비스 이용 중 부득이한 사유로 서비스가 중지된 경우, 회사는 이용하지 않은 부분에 대해 환불 절차를 밟습니다. ③ 회원의 귀책사유로 인해 서비스 이용이 중지된 경우, 환불이 불가능합니다. ④ 환불은 회원이 지정한 계좌로 환불 절차를 거치며, 환불 요청 후 7일 이내에 처리됩니다.\\n제22조 (유료 서비스의 중지 및 해지)\\n① 회원이 유료 서비스를 해지하고자 하는 경우, 회사의 고객 지원 센터에 해지 신청을 해야 합니다. ② 회사는 회원이 약관을 위반하거나 부정한 방법으로 유료 서비스를 이용한 경우, 유료 서비스 이용을 즉시 중지하고 계약을 해지할 수 있습니다.\\n제10장 양도 금지\\n제23조 (양도 금지)\\n회원은 서비스 이용권한, 기타 이용계약상의 지위를 제3자에게 양도, 증여할 수 없으며, 이를 담보로 제공할 수 없습니다.\\n제11장 관할 법원\\n제24조 (분쟁 해결)\\n서비스 이용과 관련하여 분쟁이 발생한 경우, 회사와 회원은 성실히 협의하여 해결합니다.\\n제25조 (관할 법원)\\n본 약관에 따른 분쟁은 서울중앙지방법원을 관할 법원으로 합니다.\\n부칙\\n본 약관은 2024년 10월 1일부터 시행됩니다.\\n"
+
+[msg.userfront.signup.agreement]
+title = "서비스 이용을 위해\\\\n약관에 동의해주세요"
+
+[msg.userfront.signup.auth]
+affiliate_notice = "가족사 회원의 경우 반드시 회사 공식 이메일을 입력해주세요."
+title = "본인 확인을 위해\\\\n인증을 진행해주세요"
+
+[msg.userfront.signup.email]
+code_mismatch = "인증코드가 일치하지 않습니다."
+duplicate = "이미 가입된 이메일입니다."
+invalid = "유효한 이메일 형식이 아닙니다."
+send_failed = "발송 실패: {error}"
+verified = "✅ 이메일 인증 완료"
+verify_failed = "인증 실패: {error}"
+
+[msg.userfront.signup.password]
+length_required = "비밀번호는 최소 12자 이상이어야 합니다."
+lowercase_required = "소문자가 최소 1개 이상 포함되어야 합니다."
+mismatch = "비밀번호가 일치하지 않습니다."
+number_required = "숫자가 최소 1개 이상 포함되어야 합니다."
+symbol_required = "특수문자가 최소 1개 이상 포함되어야 합니다."
+title = "마지막으로\\\\n비밀번호를 설정해주세요"
+uppercase_required = "대문자가 최소 1개 이상 포함되어야 합니다."
+
+[msg.userfront.signup.password.rule]
+lowercase = "소문자"
+min_length = "{count}자 이상"
+min_types = "문자 유형 {count}가지 이상"
+number = "숫자"
+symbol = "특수문자"
+uppercase = "대문자"
+
+[msg.userfront.signup.phone]
+code_mismatch = "인증코드가 일치하지 않습니다."
+send_failed = "발송 실패: {error}"
+verified = "✅ 휴대폰 인증 완료"
+verify_failed = "인증 실패: {error}"
+
+[msg.userfront.signup.policy]
+loading = "비밀번호 정책을 불러오는 중입니다..."
+lowercase = "소문자"
+min_length = "최소 {count}자 이상"
+min_types = "영문 대/소문자/숫자/특수문자 중 {count}가지 이상"
+number = "숫자"
+summary = "보안 정책: {rules}"
+symbol = "특수문자"
+uppercase = "대문자"
+
+[msg.userfront.signup.profile]
+affiliate_hint = "가족사 이메일 사용 시 자동으로 선택됩니다."
+title = "회원님의\\\\n소속 정보를 알려주세요"
+
+[msg.userfront.signup.success]
+body = "성공적으로 가입되었습니다."
+title = "회원가입 완료"
+
+[ui.common]
+add = "추가"
+back = "돌아가기"
+cancel = "취소"
+close = "닫기"
+collapse = "접기"
+confirm = "확인"
+copy = "복사"
+create = "생성"
+delete = "삭제"
+details = "상세정보"
+edit = "편집"
+hyphen = "-"
+na = "N/A"
+never = "Never"
+next = "Next"
+page_of = "Page {page} of {total}"
+prev = "이전"
+previous = "Previous"
+qr = "QR"
+read_only = "읽기 전용"
+refresh = "새로고침"
+requesting = "요청 중..."
+resend = "재발송"
+retry = "다시 시도"
+save = "저장"
+search = "검색"
+show_more = "+ 더보기"
+language = "언어"
+language_ko = "한국어"
+language_en = "영어"
+theme_dark = "Dark"
+theme_light = "Light"
+theme_toggle = "테마 전환"
+unknown = "Unknown"
+
+[ui.common.badge]
+admin_only = "Admin only"
+command_only = "Command only"
+system = "System"
+
+[ui.common.role]
+admin = "Admin"
+user = "User"
+
+[ui.common.status]
+active = "Active"
+blocked = "Blocked"
+failure = "실패"
+inactive = "Inactive"
+ok = "정상"
+pending = "준비 중"
+success = "성공"
+
+[ui.userfront]
+app_title = "Baron SW 포탈"
+
+[ui.userfront.app_label]
+admin_console = "Admin Console"
+baron = "Baron 로그인"
+dev_console = "Dev Console"
+
+[ui.userfront.audit]
+
+[ui.userfront.audit.table]
+app = "애플리케이션"
+auth_method = "인증수단"
+date = "접속일자"
+device = "접속환경"
+ip = "IP"
+pending = "(준비중)"
+result = "인증결과"
+session_id = "Session ID"
+status = "현황"
+
+[ui.userfront.auth_method]
+ory = "Ory 세션"
+session = "세션"
+
+[ui.userfront.dashboard]
+last_auth_label = "최근 인증"
+status_history = "상태 이력"
+
+[ui.userfront.dashboard.activity]
+linked = "연동됨"
+
+[ui.userfront.dashboard.approved_session]
+default = "승인한 세션 ID"
+userfront = "승인한 Userfront 세션 ID"
+
+[ui.userfront.dashboard.revoke]
+confirm_button = "해지하기"
+title = "연동 해지"
+
+[ui.userfront.dashboard.scopes]
+title = "권한 (Scopes)"
+
+[ui.userfront.dashboard.status]
+revoked = "해지됨"
+
+[ui.userfront.device]
+android = "Mobile(Android)"
+ios = "Mobile(iOS)"
+linux = "Desktop(Linux)"
+macos = "Desktop(macOS)"
+windows = "Desktop(Windows)"
+
+[ui.userfront.error]
+go_home = "홈으로 이동"
+go_login = "로그인으로 이동"
+
+[ui.userfront.forgot]
+heading = "비밀번호를 잊으셨나요?"
+input_label = "이메일 또는 휴대폰 번호"
+submit = "재설정 링크 전송"
+title = "비밀번호 재설정"
+
+[ui.userfront.login]
+forgot_password = "비밀번호를 잊으셨나요?"
+signup = "회원가입"
+
+[ui.userfront.login.action]
+submit = "로그인"
+
+[ui.userfront.login.field]
+login_id = "이메일 또는 휴대폰 번호"
+password = "비밀번호"
+
+[ui.userfront.login.link]
+action_label = "로그인 화면으로 이동"
+code_only = "코드만 받기({time})"
+page_title = "링크 로그인"
+resend_with_time = "재발송 ({time})"
+send = "로그인 링크 전송"
+title = "링크 로그인 완료"
+
+[ui.userfront.login.qr]
+expired = "QR 코드 만료됨"
+refresh = "QR 코드 새로고침"
+remaining = "남은 시간: {time}"
+
+[ui.userfront.login.short_code]
+digits = "숫자 6자리"
+expire_time = "유효시간 {time}"
+prefix = "영문 2자리"
+submit = "코드로 로그인"
+
+[ui.userfront.login.tabs]
+link = "로그인 링크"
+password = "비밀번호"
+qr = "QR 코드"
+
+[ui.userfront.login.unregistered]
+action = "회원가입 하기"
+title = "미등록 회원"
+
+[ui.userfront.login.verification]
+action_label = "확인"
+page_title = "로그인 승인"
+title = "승인 완료"
+
+[ui.userfront.login_success]
+later = "나중에 하기 (대시보드로 이동)"
+qr = "QR 인증 (카메라 켜기)"
+title = "로그인 완료"
+
+[ui.userfront.nav]
+dashboard = "대시보드"
+logout = "로그아웃"
+profile = "내 정보"
+qr_scan = "QR 스캔"
+
+[ui.userfront.profile]
+department_empty = "소속 정보 없음"
+manage = "프로필 관리"
+user_fallback = "User"
+
+[ui.userfront.profile.field]
+affiliation = "구분"
+company_code = "회사코드"
+department = "소속"
+email = "이메일"
+name = "이름"
+tenant = "소속 테넌트"
+
+[ui.userfront.profile.password]
+change = "비밀번호 변경"
+confirm = "새 비밀번호 확인"
+current = "현재 비밀번호"
+forgot = "비밀번호를 잊으셨나요?"
+new = "새 비밀번호"
+title = "비밀번호 변경"
+
+[ui.userfront.profile.phone]
+code_hint = "인증번호 6자리"
+request_code = "인증요청"
+title = "전화번호"
+
+[ui.userfront.profile.section]
+basic = "기본 정보"
+organization = "조직 정보"
+security = "보안"
+
+[ui.userfront.qr]
+request_permission = "카메라 권한 요청하기"
+rescan = "다시 스캔"
+result_failure = "승인 실패"
+result_success = "승인 완료"
+title = "Scan QR Code"
+
+[ui.userfront.reset]
+confirm_password = "새 비밀번호 확인"
+new_password = "새 비밀번호"
+submit = "비밀번호 변경"
+subtitle = "새로운 비밀번호 설정"
+title = "새 비밀번호 설정"
+
+[ui.userfront.sections]
+apps = "나의 App 현황"
+audit = "접속이력"
+
+[ui.userfront.session]
+active = "세션 활성"
+unknown = "알 수 없음"
+
+[ui.userfront.signup]
+complete = "가입 완료"
+next_step = "다음 단계"
+title = "회원가입"
+
+[ui.userfront.signup.agreement]
+all = "모두 동의합니다"
+privacy_title = "개인정보 수집 및 이용 동의 (필수)"
+tos_title = "바론 소프트웨어 이용약관 (필수)"
+
+[ui.userfront.signup.auth]
+code_label = "인증코드 6자리"
+request_code = "인증요청"
+
+[ui.userfront.signup.auth.email]
+label = "이메일 주소"
+title = "이메일 인증"
+
+[ui.userfront.signup.password]
+confirm_label = "비밀번호 확인"
+label = "비밀번호"
+
+[ui.userfront.signup.phone]
+label = "휴대폰 번호 (-없이)"
+title = "휴대폰 인증"
+
+[ui.userfront.signup.profile]
+affiliation_type = "소속 유형"
+company = "가족사 선택"
+department = "부서명"
+department_optional = "소속 정보 (선택)"
+name = "이름"
+
+[ui.userfront.signup.steps]
+agreement = "약관동의"
+password = "비밀번호"
+profile = "정보입력"
+verify = "본인인증"
+
+[ui.userfront.signup.success]
+action = "로그인하기"
diff --git a/userfront/assets/translations/template.toml b/userfront/assets/translations/template.toml
new file mode 100644
index 00000000..90155a9d
--- /dev/null
+++ b/userfront/assets/translations/template.toml
@@ -0,0 +1,536 @@
+[err.userfront]
+
+[err.userfront.auth_proxy]
+consent_accept = ""
+consent_fetch = ""
+consent_reject = ""
+linked_app_revoke = ""
+login_failed = ""
+oidc_accept = ""
+password_reset_complete = ""
+password_reset_init = ""
+
+[err.userfront.profile]
+load_failed = ""
+password_change_failed = ""
+send_code_failed = ""
+update_failed = ""
+verify_code_failed = ""
+
+[err.userfront.session]
+missing = ""
+
+[msg.userfront]
+greeting = ""
+
+[msg.userfront.audit]
+date = ""
+device = ""
+end = ""
+ip = ""
+load_more_error = ""
+result = ""
+session_id = ""
+status = ""
+
+[msg.userfront.dashboard]
+approved_device = ""
+approved_ip = ""
+audit_empty = ""
+audit_load_error = ""
+auth_method = ""
+client_id = ""
+client_id_missing = ""
+current_status = ""
+last_auth = ""
+link_missing = ""
+link_open_error = ""
+session_id_copied = ""
+
+[msg.userfront.dashboard.activities]
+empty = ""
+empty_detail = ""
+error = ""
+
+[msg.userfront.dashboard.approved_session]
+copy_click = ""
+copy_tap = ""
+none = ""
+
+[msg.userfront.dashboard.revoke]
+confirm = ""
+error = ""
+success = ""
+
+[msg.userfront.dashboard.scopes]
+empty = ""
+
+[msg.userfront.dashboard.timeline]
+load_error = ""
+
+[msg.userfront.error]
+detail_contact = ""
+detail_generic = ""
+detail_request = ""
+id = ""
+title = ""
+title_generic = ""
+title_with_code = ""
+type = ""
+
+[msg.userfront.error.whitelist]
+settings_disabled = ""
+
+[msg.userfront.forgot]
+description = ""
+dry_send = ""
+error = ""
+input_required = ""
+sent = ""
+
+[msg.userfront.login]
+cookie_check_failed = ""
+dry_send = ""
+link_failed = ""
+link_send_failed = ""
+link_sent_email = ""
+link_sent_phone = ""
+link_timeout = ""
+no_account = ""
+oidc_failed = ""
+qr_expired = ""
+qr_init_failed = ""
+qr_login_required = ""
+token_missing = ""
+verification_failed = ""
+
+[msg.userfront.login.link]
+approved = ""
+helper = ""
+missing_login_id = ""
+missing_phone = ""
+resend_wait = ""
+short_code_help = ""
+
+[msg.userfront.login.password]
+failed = ""
+missing_credentials = ""
+
+[msg.userfront.login.qr]
+load_failed = ""
+scan_hint = ""
+
+[msg.userfront.login.short_code]
+invalid = ""
+
+[msg.userfront.login.unregistered]
+body = ""
+
+[msg.userfront.login.verification]
+approved = ""
+approved_local = ""
+success = ""
+
+[msg.userfront.login_success]
+subtitle = ""
+
+[msg.userfront.profile]
+department_missing = ""
+department_required = ""
+email_missing = ""
+greeting = ""
+load_failed = ""
+name_missing = ""
+name_required = ""
+phone_required = ""
+phone_verify_required = ""
+update_failed = ""
+update_success = ""
+
+[msg.userfront.profile.password]
+change_failed = ""
+changed = ""
+current_required = ""
+mismatch = ""
+new_required = ""
+subtitle = ""
+
+[msg.userfront.profile.phone]
+code_sent = ""
+send_failed = ""
+verified = ""
+verify_failed = ""
+verify_notice = ""
+
+[msg.userfront.profile.section]
+basic = ""
+organization = ""
+security = ""
+
+[msg.userfront.qr]
+approve_error = ""
+approve_success = ""
+camera_error = ""
+permission_error = ""
+permission_required = ""
+
+[msg.userfront.reset]
+invalid_body = ""
+invalid_link = ""
+invalid_title = ""
+policy_loading = ""
+success = ""
+
+[msg.userfront.reset.error]
+empty_password = ""
+generic = ""
+lowercase = ""
+min_length = ""
+min_types = ""
+mismatch = ""
+number = ""
+symbol = ""
+uppercase = ""
+
+[msg.userfront.reset.policy]
+lowercase = ""
+min_length = ""
+min_types = ""
+number = ""
+symbol = ""
+uppercase = ""
+
+[msg.userfront.sections]
+apps_subtitle = ""
+audit_subtitle = ""
+
+[msg.userfront.settings]
+disabled = ""
+
+[msg.userfront.signup]
+failed = ""
+privacy_full = ""
+tos_full = ""
+
+[msg.userfront.signup.agreement]
+title = ""
+
+[msg.userfront.signup.auth]
+affiliate_notice = ""
+title = ""
+
+[msg.userfront.signup.email]
+code_mismatch = ""
+duplicate = ""
+invalid = ""
+send_failed = ""
+verified = ""
+verify_failed = ""
+
+[msg.userfront.signup.password]
+length_required = ""
+lowercase_required = ""
+mismatch = ""
+number_required = ""
+symbol_required = ""
+title = ""
+uppercase_required = ""
+
+[msg.userfront.signup.password.rule]
+lowercase = ""
+min_length = ""
+min_types = ""
+number = ""
+symbol = ""
+uppercase = ""
+
+[msg.userfront.signup.phone]
+code_mismatch = ""
+send_failed = ""
+verified = ""
+verify_failed = ""
+
+[msg.userfront.signup.policy]
+loading = ""
+lowercase = ""
+min_length = ""
+min_types = ""
+number = ""
+summary = ""
+symbol = ""
+uppercase = ""
+
+[msg.userfront.signup.profile]
+affiliate_hint = ""
+title = ""
+
+[msg.userfront.signup.success]
+body = ""
+title = ""
+
+[ui.common]
+add = ""
+back = ""
+cancel = ""
+close = ""
+collapse = ""
+confirm = ""
+copy = ""
+create = ""
+delete = ""
+details = ""
+edit = ""
+hyphen = ""
+na = ""
+never = ""
+next = ""
+page_of = ""
+prev = ""
+previous = ""
+qr = ""
+read_only = ""
+refresh = ""
+requesting = ""
+resend = ""
+retry = ""
+save = ""
+search = ""
+show_more = ""
+language = ""
+language_ko = ""
+language_en = ""
+theme_dark = ""
+theme_light = ""
+theme_toggle = ""
+unknown = ""
+
+[ui.common.badge]
+admin_only = ""
+command_only = ""
+system = ""
+
+[ui.common.role]
+admin = ""
+user = ""
+
+[ui.common.status]
+active = ""
+blocked = ""
+failure = ""
+inactive = ""
+ok = ""
+pending = ""
+success = ""
+
+[ui.userfront]
+app_title = ""
+
+[ui.userfront.app_label]
+admin_console = ""
+baron = ""
+dev_console = ""
+
+[ui.userfront.audit]
+
+[ui.userfront.audit.table]
+app = ""
+auth_method = ""
+date = ""
+device = ""
+ip = ""
+pending = ""
+result = ""
+session_id = ""
+status = ""
+
+[ui.userfront.auth_method]
+ory = ""
+session = ""
+
+[ui.userfront.dashboard]
+last_auth_label = ""
+status_history = ""
+
+[ui.userfront.dashboard.activity]
+linked = ""
+
+[ui.userfront.dashboard.approved_session]
+default = ""
+userfront = ""
+
+[ui.userfront.dashboard.revoke]
+confirm_button = ""
+title = ""
+
+[ui.userfront.dashboard.scopes]
+title = ""
+
+[ui.userfront.dashboard.status]
+revoked = ""
+
+[ui.userfront.device]
+android = ""
+ios = ""
+linux = ""
+macos = ""
+windows = ""
+
+[ui.userfront.error]
+go_home = ""
+go_login = ""
+
+[ui.userfront.forgot]
+heading = ""
+input_label = ""
+submit = ""
+title = ""
+
+[ui.userfront.login]
+forgot_password = ""
+signup = ""
+
+[ui.userfront.login.action]
+submit = ""
+
+[ui.userfront.login.field]
+login_id = ""
+password = ""
+
+[ui.userfront.login.link]
+action_label = ""
+code_only = ""
+page_title = ""
+resend_with_time = ""
+send = ""
+title = ""
+
+[ui.userfront.login.qr]
+expired = ""
+refresh = ""
+remaining = "Remaining: {time}"
+
+[ui.userfront.login.short_code]
+digits = ""
+expire_time = ""
+prefix = ""
+submit = ""
+
+[ui.userfront.login.tabs]
+link = ""
+password = ""
+qr = ""
+
+[ui.userfront.login.unregistered]
+action = ""
+title = ""
+
+[ui.userfront.login.verification]
+action_label = ""
+page_title = ""
+title = ""
+
+[ui.userfront.login_success]
+later = ""
+qr = ""
+title = ""
+
+[ui.userfront.nav]
+dashboard = ""
+logout = ""
+profile = ""
+qr_scan = ""
+
+[ui.userfront.profile]
+department_empty = ""
+manage = ""
+user_fallback = ""
+
+[ui.userfront.profile.field]
+affiliation = ""
+company_code = ""
+department = ""
+email = ""
+name = ""
+tenant = ""
+
+[ui.userfront.profile.password]
+change = ""
+confirm = ""
+current = ""
+forgot = ""
+new = ""
+title = ""
+
+[ui.userfront.profile.phone]
+code_hint = ""
+request_code = ""
+title = ""
+
+[ui.userfront.profile.section]
+basic = ""
+organization = ""
+security = ""
+
+[ui.userfront.qr]
+request_permission = ""
+rescan = ""
+result_failure = ""
+result_success = ""
+title = ""
+
+[ui.userfront.reset]
+confirm_password = ""
+new_password = ""
+submit = ""
+subtitle = ""
+title = ""
+
+[ui.userfront.sections]
+apps = ""
+audit = ""
+
+[ui.userfront.session]
+active = ""
+unknown = ""
+
+[ui.userfront.signup]
+complete = ""
+next_step = ""
+title = ""
+
+[ui.userfront.signup.agreement]
+all = ""
+privacy_title = ""
+tos_title = ""
+
+[ui.userfront.signup.auth]
+code_label = ""
+request_code = ""
+
+[ui.userfront.signup.auth.email]
+label = ""
+title = ""
+
+[ui.userfront.signup.password]
+confirm_label = ""
+label = ""
+
+[ui.userfront.signup.phone]
+label = ""
+title = ""
+
+[ui.userfront.signup.profile]
+affiliation_type = ""
+company = ""
+department = ""
+department_optional = ""
+name = ""
+
+[ui.userfront.signup.steps]
+agreement = ""
+password = ""
+profile = ""
+verify = ""
+
+[ui.userfront.signup.success]
+action = ""
diff --git a/userfront/lib/core/i18n/locale_gate.dart b/userfront/lib/core/i18n/locale_gate.dart
new file mode 100644
index 00000000..79c0a35f
--- /dev/null
+++ b/userfront/lib/core/i18n/locale_gate.dart
@@ -0,0 +1,51 @@
+import 'package:easy_localization/easy_localization.dart' hide tr;
+import 'package:flutter/material.dart';
+
+import 'package:userfront/i18n.dart';
+import '../services/web_window.dart';
+import 'locale_storage.dart';
+import 'locale_utils.dart';
+
+class LocaleGate extends StatefulWidget {
+  const LocaleGate({super.key, required this.localeCode, required this.child});
+
+  final String localeCode;
+  final Widget child;
+
+  @override
+  State<LocaleGate> createState() => _LocaleGateState();
+}
+
+class _LocaleGateState extends State<LocaleGate> {
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _applyLocale();
+  }
+
+  @override
+  void didUpdateWidget(LocaleGate oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.localeCode != widget.localeCode) {
+      _applyLocale();
+    }
+  }
+
+  Future<void> _applyLocale() async {
+    final normalized = normalizeLocaleCode(widget.localeCode);
+    LocaleStorage.write(normalized);
+    webWindow.setTitle(
+      tr('ui.userfront.app_title'),
+    );
+    if (context.locale.languageCode == normalized) {
+      return;
+    }
+    await context.setLocale(Locale(normalized));
+    webWindow.setTitle(
+      tr('ui.userfront.app_title'),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) => widget.child;
+}
diff --git a/userfront/lib/core/i18n/locale_storage.dart b/userfront/lib/core/i18n/locale_storage.dart
new file mode 100644
index 00000000..e54b144e
--- /dev/null
+++ b/userfront/lib/core/i18n/locale_storage.dart
@@ -0,0 +1,7 @@
+import 'locale_storage_stub.dart'
+    if (dart.library.html) 'locale_storage_web.dart';
+
+abstract class LocaleStorage {
+  static String? read() => localeStorage.read();
+  static void write(String locale) => localeStorage.write(locale);
+}
diff --git a/userfront/lib/core/i18n/locale_storage_stub.dart b/userfront/lib/core/i18n/locale_storage_stub.dart
new file mode 100644
index 00000000..520cd6a4
--- /dev/null
+++ b/userfront/lib/core/i18n/locale_storage_stub.dart
@@ -0,0 +1,11 @@
+class LocaleStorageImpl {
+  String? _locale;
+
+  String? read() => _locale;
+
+  void write(String locale) {
+    _locale = locale;
+  }
+}
+
+final localeStorage = LocaleStorageImpl();
diff --git a/userfront/lib/core/i18n/locale_storage_web.dart b/userfront/lib/core/i18n/locale_storage_web.dart
new file mode 100644
index 00000000..06c36e99
--- /dev/null
+++ b/userfront/lib/core/i18n/locale_storage_web.dart
@@ -0,0 +1,120 @@
+// ignore_for_file: avoid_web_libraries_in_flutter
+
+import 'dart:html' as html;
+import 'package:flutter/foundation.dart';
+
+class LocaleStorageImpl {
+  static const _key = 'locale';
+  static const _legacyKey = 'baron_locale';
+  static final Map<String, String> _memory = {};
+  static bool _forceMemory = false;
+  static bool _forceSession = false;
+
+  @visibleForTesting
+  static void forceMemoryStorageForTests(bool value) {
+    _forceMemory = value;
+    if (!value) {
+      _memory.clear();
+    }
+  }
+
+  @visibleForTesting
+  static void forceSessionStorageForTests(bool value) {
+    _forceSession = value;
+  }
+
+  String? _read(String key) {
+    if (!_forceMemory && !_forceSession) {
+      try {
+        return html.window.localStorage[key];
+      } catch (_) {
+        // localStorage 접근이 차단된 경우 sessionStorage로 fallback.
+        try {
+          return html.window.sessionStorage[key];
+        } catch (_) {
+          // sessionStorage도 차단된 경우 메모리 fallback 사용.
+        }
+      }
+    }
+    if (!_forceMemory) {
+      try {
+        return html.window.sessionStorage[key];
+      } catch (_) {
+        // sessionStorage도 차단된 경우 메모리 fallback 사용.
+      }
+    }
+    return _memory[key];
+  }
+
+  void _write(String key, String value) {
+    if (!_forceMemory && !_forceSession) {
+      try {
+        html.window.localStorage[key] = value;
+        return;
+      } catch (_) {
+        // localStorage 접근이 차단된 경우 sessionStorage로 fallback.
+        try {
+          html.window.sessionStorage[key] = value;
+          return;
+        } catch (_) {
+          // sessionStorage도 차단된 경우 메모리 fallback 사용.
+        }
+      }
+    }
+    if (!_forceMemory) {
+      try {
+        html.window.sessionStorage[key] = value;
+        return;
+      } catch (_) {
+        // sessionStorage도 차단된 경우 메모리 fallback 사용.
+      }
+    }
+    _memory[key] = value;
+  }
+
+  void _remove(String key) {
+    if (!_forceMemory && !_forceSession) {
+      try {
+        html.window.localStorage.remove(key);
+        return;
+      } catch (_) {
+        // localStorage 접근이 차단된 경우 sessionStorage로 fallback.
+        try {
+          html.window.sessionStorage.remove(key);
+          return;
+        } catch (_) {
+          // sessionStorage도 차단된 경우 메모리 fallback 사용.
+        }
+      }
+    }
+    if (!_forceMemory) {
+      try {
+        html.window.sessionStorage.remove(key);
+        return;
+      } catch (_) {
+        // sessionStorage도 차단된 경우 메모리 fallback 사용.
+      }
+    }
+    _memory.remove(key);
+  }
+
+  String? read() {
+    final current = _read(_key);
+    if (current != null && current.isNotEmpty) {
+      return current;
+    }
+    final legacy = _read(_legacyKey);
+    if (legacy != null && legacy.isNotEmpty) {
+      _write(_key, legacy);
+      _remove(_legacyKey);
+      return legacy;
+    }
+    return null;
+  }
+
+  void write(String locale) {
+    _write(_key, locale);
+  }
+}
+
+final localeStorage = LocaleStorageImpl();
diff --git a/userfront/lib/core/i18n/locale_utils.dart b/userfront/lib/core/i18n/locale_utils.dart
new file mode 100644
index 00000000..7bbda20f
--- /dev/null
+++ b/userfront/lib/core/i18n/locale_utils.dart
@@ -0,0 +1,69 @@
+import 'dart:ui';
+
+import 'locale_storage.dart';
+
+const supportedLocaleCodes = ['en', 'ko'];
+const defaultLocaleCode = 'en';
+
+String normalizeLocaleCode(String? code) {
+  if (code == null || code.isEmpty) {
+    return defaultLocaleCode;
+  }
+  final normalized = code.toLowerCase();
+  if (normalized == 'ko' || normalized.startsWith('ko-')) {
+    return 'ko';
+  }
+  if (normalized == 'en' || normalized.startsWith('en-')) {
+    return 'en';
+  }
+  return defaultLocaleCode;
+}
+
+String resolvePreferredLocaleCode() {
+  final stored = LocaleStorage.read();
+  if (stored != null && supportedLocaleCodes.contains(stored)) {
+    return stored;
+  }
+  final deviceLocale = PlatformDispatcher.instance.locale;
+  return normalizeLocaleCode(deviceLocale.languageCode);
+}
+
+String? extractLocaleFromPath(Uri uri) {
+  if (uri.pathSegments.isEmpty) {
+    return null;
+  }
+  final code = uri.pathSegments.first.toLowerCase();
+  if (supportedLocaleCodes.contains(code)) {
+    return code;
+  }
+  return null;
+}
+
+String stripLocalePath(Uri uri) {
+  final segments = uri.pathSegments;
+  if (segments.isNotEmpty && supportedLocaleCodes.contains(segments.first)) {
+    final rest = segments.skip(1).join('/');
+    if (rest.isEmpty) {
+      return '/';
+    }
+    return '/$rest';
+  }
+  return uri.path;
+}
+
+String buildLocalizedPath(String localeCode, Uri uri) {
+  final segments = uri.pathSegments;
+  Iterable<String> restSegments = segments;
+  if (segments.isNotEmpty) {
+    final head = segments.first.toLowerCase();
+    if (supportedLocaleCodes.contains(head) || head.length == 2) {
+      restSegments = segments.skip(1);
+    }
+  }
+  final newSegments = [localeCode, ...restSegments];
+  final path = '/${newSegments.join('/')}';
+  if (uri.queryParameters.isEmpty) {
+    return path;
+  }
+  return Uri(path: path, queryParameters: uri.queryParameters).toString();
+}
diff --git a/userfront/lib/core/i18n/toml_asset_loader.dart b/userfront/lib/core/i18n/toml_asset_loader.dart
new file mode 100644
index 00000000..5170eccb
--- /dev/null
+++ b/userfront/lib/core/i18n/toml_asset_loader.dart
@@ -0,0 +1,22 @@
+import 'dart:ui';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/services.dart';
+import 'package:toml/toml.dart';
+
+class TomlAssetLoader extends AssetLoader {
+  const TomlAssetLoader();
+
+  @override
+  Future<Map<String, dynamic>> load(String path, Locale locale) async {
+    final assetPath = '$path/${locale.languageCode}.toml';
+    try {
+      final content = await rootBundle.loadString(assetPath);
+      final document = TomlDocument.parse(content);
+      return document.toMap();
+    } catch (e) {
+      // 로딩 실패 시 빈 맵을 반환해 렌더링을 지속합니다.
+      return {};
+    }
+  }
+}
diff --git a/userfront/lib/core/services/auth_proxy_service.dart b/userfront/lib/core/services/auth_proxy_service.dart
index c5431ed2..b3d44dcf 100644
--- a/userfront/lib/core/services/auth_proxy_service.dart
+++ b/userfront/lib/core/services/auth_proxy_service.dart
@@ -11,18 +11,34 @@ class AuthProxyService {
     if (!dotenv.isInitialized) {
       return fallback;
     }
-    return dotenv.env[key] ?? fallback;
+    final value = dotenv.env[key];
+    if (value == null || value.trim().isEmpty) {
+      return fallback;
+    }
+    return value;
+  }
+
+  static String _fallbackOrigin() {
+    try {
+      final origin = Uri.base.origin;
+      if (origin.isNotEmpty && origin != 'null') {
+        return origin;
+      }
+    } catch (_) {}
+    return 'http://sso.hmac.kr';
   }
 
   static String get _baseUrl {
-    final rawUrl = _envOrDefault('BACKEND_URL', 'https://sso.hmac.kr');
+    final rawUrl = _envOrDefault('BACKEND_URL', _fallbackOrigin());
     // 배포 환경에서 $ 기호나 공백이 섞여 들어오는 경우를 방지하기 위해 정제합니다.
     return rawUrl.replaceAll(r'$', '').trim().replaceAll(RegExp(r'/$'), '');
   }
+
   static bool get _isProd {
     final env = _envOrDefault('APP_ENV', 'dev').toLowerCase();
     return env == 'prod' || env == 'production';
   }
+
   static bool get isProdEnv => _isProd;
   static bool _shouldSendDrySend(bool? drySend) {
     if (_isProd) {
@@ -76,13 +92,14 @@ class AuthProxyService {
     }
   }
 
-  static Future<int> getSessionStatus({String? token, bool useCookie = false}) async {
+  static Future<int> getSessionStatus({
+    String? token,
+    bool useCookie = false,
+  }) async {
     final url = Uri.parse('$_baseUrl/api/v1/user/me');
     final client = createHttpClient(withCredentials: useCookie);
     try {
-      final headers = <String, String>{
-        'Content-Type': 'application/json',
-      };
+      final headers = <String, String>{'Content-Type': 'application/json'};
       if (!useCookie && token != null && token.isNotEmpty) {
         headers['Authorization'] = 'Bearer $token';
       }
@@ -100,12 +117,9 @@ class AuthProxyService {
     bool? drySend,
   }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/enchanted-link/init');
-    final userfrontUrl = _envOrDefault('USERFRONT_URL', 'http://sso.hmac.kr');
-    
-    final body = <String, dynamic>{
-      'loginId': loginId,
-      'uri': userfrontUrl,
-    };
+    final userfrontUrl = _envOrDefault('USERFRONT_URL', _fallbackOrigin());
+
+    final body = <String, dynamic>{'loginId': loginId, 'uri': userfrontUrl};
     if (_shouldSendDrySend(drySend)) {
       body['drySend'] = true;
     }
@@ -115,7 +129,7 @@ class AuthProxyService {
     if (codeOnly == true) {
       body['codeOnly'] = true;
     }
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
@@ -133,15 +147,15 @@ class AuthProxyService {
     }
   }
 
-  static Future<Map<String, dynamic>> pollEnchantedLink(String pendingRef) async {
+  static Future<Map<String, dynamic>> pollEnchantedLink(
+    String pendingRef,
+  ) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/enchanted-link/poll');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'pendingRef': pendingRef,
-      }),
+      body: jsonEncode({'pendingRef': pendingRef}),
     );
 
     if (response.statusCode == 200) {
@@ -157,16 +171,16 @@ class AuthProxyService {
     );
   }
 
-  static Future<Map<String, dynamic>> verifyMagicLink(String token, {bool verifyOnly = false}) async {
+  static Future<Map<String, dynamic>> verifyMagicLink(
+    String token, {
+    bool verifyOnly = false,
+  }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/magic-link/verify');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'token': token,
-        'verifyOnly': verifyOnly,
-      }),
+      body: jsonEncode({'token': token, 'verifyOnly': verifyOnly}),
     );
 
     if (response.statusCode == 200) {
@@ -223,10 +237,7 @@ class AuthProxyService {
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'shortCode': shortCode,
-        'verifyOnly': verifyOnly,
-      }),
+      body: jsonEncode({'shortCode': shortCode, 'verifyOnly': verifyOnly}),
     );
 
     if (response.statusCode == 200) {
@@ -240,13 +251,18 @@ class AuthProxyService {
     }
   }
 
-  static Future<Map<String, dynamic>> loginWithPassword(String loginId, String password, {String? loginChallenge}) async {
+  static Future<Map<String, dynamic>> loginWithPassword(
+    String loginId,
+    String password, {
+    String? loginChallenge,
+  }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/password/login');
-    
+
     final payload = {
       'loginId': loginId,
       'password': password,
-      if (loginChallenge != null && loginChallenge.isNotEmpty) 'login_challenge': loginChallenge,
+      if (loginChallenge != null && loginChallenge.isNotEmpty)
+        'login_challenge': loginChallenge,
     };
 
     final response = await http.post(
@@ -267,13 +283,17 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.login_failed',
-              fallback: '로그인에 실패했습니다.',
             ),
       );
     }
   }
-  static Future<Map<String, dynamic>> getConsentInfo(String consentChallenge) async {
-    final url = Uri.parse('$_baseUrl/api/v1/auth/consent').replace(queryParameters: {'consent_challenge': consentChallenge});
+
+  static Future<Map<String, dynamic>> getConsentInfo(
+    String consentChallenge,
+  ) async {
+    final url = Uri.parse(
+      '$_baseUrl/api/v1/auth/consent',
+    ).replace(queryParameters: {'consent_challenge': consentChallenge});
     final response = await http.get(
       url,
       headers: {'Content-Type': 'application/json'},
@@ -287,17 +307,17 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.consent_fetch',
-              fallback: '동의 정보를 가져오지 못했습니다.',
             ),
       );
     }
   }
 
-  static Future<Map<String, dynamic>> acceptConsent(String consentChallenge, {List<String>? grantScope}) async {
+  static Future<Map<String, dynamic>> acceptConsent(
+    String consentChallenge, {
+    List<String>? grantScope,
+  }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/consent/accept');
-    final body = <String, dynamic>{
-      'consent_challenge': consentChallenge,
-    };
+    final body = <String, dynamic>{'consent_challenge': consentChallenge};
     if (grantScope != null) {
       body['grant_scope'] = grantScope;
     }
@@ -316,17 +336,16 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.consent_accept',
-              fallback: '동의 처리에 실패했습니다.',
             ),
       );
     }
   }
 
-  static Future<Map<String, dynamic>> rejectConsent(String consentChallenge) async {
+  static Future<Map<String, dynamic>> rejectConsent(
+    String consentChallenge,
+  ) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/consent/reject');
-    final body = <String, dynamic>{
-      'consent_challenge': consentChallenge,
-    };
+    final body = <String, dynamic>{'consent_challenge': consentChallenge};
 
     final response = await http.post(
       url,
@@ -342,7 +361,6 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.consent_reject',
-              fallback: '동의 거부에 실패했습니다.',
             ),
       );
     }
@@ -353,9 +371,7 @@ class AuthProxyService {
     String? token,
   }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/oidc/login/accept');
-    final headers = <String, String>{
-      'Content-Type': 'application/json',
-    };
+    final headers = <String, String>{'Content-Type': 'application/json'};
     if (token != null && token.isNotEmpty) {
       headers['Authorization'] = 'Bearer $token';
     }
@@ -364,9 +380,7 @@ class AuthProxyService {
       final response = await client.post(
         url,
         headers: headers,
-        body: jsonEncode({
-          'login_challenge': loginChallenge,
-        }),
+        body: jsonEncode({'login_challenge': loginChallenge}),
       );
 
       if (response.statusCode == 200) {
@@ -377,7 +391,6 @@ class AuthProxyService {
           errorBody['error'] ??
               tr(
                 'err.userfront.auth_proxy.oidc_accept',
-                fallback: 'OIDC 로그인 승인에 실패했습니다.',
               ),
         );
       }
@@ -386,8 +399,10 @@ class AuthProxyService {
     }
   }
 
-
-  static Future<Map<String, dynamic>> initiatePasswordReset(String loginId, {bool? drySend}) async {
+  static Future<Map<String, dynamic>> initiatePasswordReset(
+    String loginId, {
+    bool? drySend,
+  }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/password/reset/initiate');
     final response = await http.post(
       url,
@@ -406,7 +421,6 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.password_reset_init',
-              fallback: '비밀번호 재설정을 시작하지 못했습니다.',
             ),
       );
     }
@@ -424,7 +438,9 @@ class AuthProxyService {
     if (token != null && token.isNotEmpty) {
       query['token'] = token;
     }
-    final url = Uri.parse('$_baseUrl/api/v1/auth/password/reset/complete').replace(queryParameters: query);
+    final url = Uri.parse(
+      '$_baseUrl/api/v1/auth/password/reset/complete',
+    ).replace(queryParameters: query);
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
@@ -439,7 +455,6 @@ class AuthProxyService {
         errorBody['error'] ??
             tr(
               'err.userfront.auth_proxy.password_reset_complete',
-              fallback: '비밀번호 재설정에 실패했습니다.',
             ),
       );
     }
@@ -447,13 +462,11 @@ class AuthProxyService {
 
   static Future<void> sendSms(String phoneNumber) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/sms');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'phoneNumber': phoneNumber,
-      }),
+      body: jsonEncode({'phoneNumber': phoneNumber}),
     );
 
     if (response.statusCode != 200) {
@@ -465,16 +478,16 @@ class AuthProxyService {
     }
   }
 
-  static Future<Map<String, dynamic>> verifySmsCode(String phoneNumber, String code) async {
+  static Future<Map<String, dynamic>> verifySmsCode(
+    String phoneNumber,
+    String code,
+  ) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/verify-sms');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'phoneNumber': phoneNumber,
-        'code': code,
-      }),
+      body: jsonEncode({'phoneNumber': phoneNumber, 'code': code}),
     );
 
     if (response.statusCode == 200) {
@@ -532,10 +545,10 @@ class AuthProxyService {
     String? token,
     bool withCredentials = false,
   }) async {
-    final url = Uri.parse('$_baseUrl/api/v1/auth/qr/approve'); // Mapping to ScanQRLogin on backend
-    final payload = <String, dynamic>{
-      'pendingRef': pendingRef,
-    };
+    final url = Uri.parse(
+      '$_baseUrl/api/v1/auth/qr/approve',
+    ); // Mapping to ScanQRLogin on backend
+    final payload = <String, dynamic>{'pendingRef': pendingRef};
     if (token != null && token.isNotEmpty) {
       payload['token'] = token;
     }
@@ -593,7 +606,7 @@ class AuthProxyService {
     String? displayName,
   }) async {
     final url = Uri.parse('$_baseUrl/api/v1/admin/users');
-    
+
     final response = await http.post(
       url,
       headers: {
@@ -617,7 +630,10 @@ class AuthProxyService {
     }
   }
 
-  static Future<List<dynamic>> listUsers(String adminPassword, {String? query}) async {
+  static Future<List<dynamic>> listUsers(
+    String adminPassword, {
+    String? query,
+  }) async {
     var uri = Uri.parse('$_baseUrl/api/v1/admin/users');
     if (query != null && query.isNotEmpty) {
       uri = uri.replace(queryParameters: {'text': query});
@@ -646,7 +662,7 @@ class AuthProxyService {
   static Future<void> deleteUser(String adminPassword, String loginId) async {
     final encodedId = Uri.encodeComponent(loginId);
     final url = Uri.parse('$_baseUrl/api/v1/admin/users/$encodedId');
-    
+
     final response = await http.delete(
       url,
       headers: {
@@ -664,10 +680,14 @@ class AuthProxyService {
     }
   }
 
-  static Future<void> updateUserStatus(String adminPassword, String loginId, String status) async {
+  static Future<void> updateUserStatus(
+    String adminPassword,
+    String loginId,
+    String status,
+  ) async {
     final encodedId = Uri.encodeComponent(loginId);
     final url = Uri.parse('$_baseUrl/api/v1/admin/users/$encodedId/status');
-    
+
     final response = await http.patch(
       url,
       headers: {
@@ -695,7 +715,7 @@ class AuthProxyService {
   }) async {
     final encodedId = Uri.encodeComponent(loginId);
     final url = Uri.parse('$_baseUrl/api/v1/admin/users/$encodedId');
-    
+
     final body = <String, dynamic>{};
     if (email != null) body['email'] = email;
     if (phone != null) body['phone'] = phone;
@@ -725,18 +745,13 @@ class AuthProxyService {
     final token = AuthTokenStore.getToken();
 
     final client = createHttpClient(withCredentials: useCookie);
-    final headers = <String, String>{
-      'Content-Type': 'application/json',
-    };
+    final headers = <String, String>{'Content-Type': 'application/json'};
     if (!useCookie && token != null) {
       headers['Authorization'] = 'Bearer $token';
     }
 
     try {
-      final response = await client.get(
-        url,
-        headers: headers,
-      );
+      final response = await client.get(url, headers: headers);
 
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body);
@@ -758,18 +773,13 @@ class AuthProxyService {
     final token = AuthTokenStore.getToken();
 
     final client = createHttpClient(withCredentials: useCookie);
-    final headers = <String, String>{
-      'Content-Type': 'application/json',
-    };
+    final headers = <String, String>{'Content-Type': 'application/json'};
     if (!useCookie && token != null) {
       headers['Authorization'] = 'Bearer $token';
     }
 
     try {
-      final response = await client.delete(
-        url,
-        headers: headers,
-      );
+      final response = await client.delete(url, headers: headers);
 
       if (response.statusCode != 200) {
         final errorBody = jsonDecode(response.body);
@@ -777,7 +787,6 @@ class AuthProxyService {
           errorBody['error'] ??
               tr(
                 'err.userfront.auth_proxy.linked_app_revoke',
-                fallback: '연동 해지에 실패했습니다.',
               ),
         );
       }
@@ -786,7 +795,11 @@ class AuthProxyService {
     }
   }
 
-  static Future<void> sendLog(String level, String message, {Map<String, dynamic>? data}) async {
+  static Future<void> sendLog(
+    String level,
+    String message, {
+    Map<String, dynamic>? data,
+  }) async {
     if (!_canSendClientLog()) {
       return;
     }
@@ -808,11 +821,15 @@ class AuthProxyService {
     }
   }
 
-  static Future<void> logError(String message, {dynamic error, StackTrace? stackTrace}) async {
+  static Future<void> logError(
+    String message, {
+    dynamic error,
+    StackTrace? stackTrace,
+  }) async {
     final data = <String, dynamic>{};
     if (error != null) data['error'] = error.toString();
     if (stackTrace != null) data['stack'] = stackTrace.toString();
-    
+
     await sendLog('ERROR', message, data: data);
   }
 
@@ -861,7 +878,7 @@ class AuthProxyService {
   static Future<void> sendSignupCode(String target, String type) async {
     final path = type == 'email' ? 'send-email-code' : 'send-sms-code';
     final url = Uri.parse('$_baseUrl/api/v1/auth/signup/$path');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
@@ -877,17 +894,17 @@ class AuthProxyService {
     }
   }
 
-  static Future<bool> verifySignupCode(String target, String type, String code) async {
+  static Future<bool> verifySignupCode(
+    String target,
+    String type,
+    String code,
+  ) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/signup/verify-code');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({
-        'target': target,
-        'type': type,
-        'code': code,
-      }),
+      body: jsonEncode({'target': target, 'type': type, 'code': code}),
     );
 
     if (response.statusCode == 200) {
@@ -908,7 +925,7 @@ class AuthProxyService {
     required bool termsAccepted,
   }) async {
     final url = Uri.parse('$_baseUrl/api/v1/auth/signup');
-    
+
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
diff --git a/userfront/lib/core/services/web_window_stub.dart b/userfront/lib/core/services/web_window_stub.dart
index e914264c..e97c02e2 100644
--- a/userfront/lib/core/services/web_window_stub.dart
+++ b/userfront/lib/core/services/web_window_stub.dart
@@ -1,4 +1,6 @@
 class WebWindow {
+  void setTitle(String title) {}
+
   void redirectTo(String url) {}
 
   void alert(String message) {}
diff --git a/userfront/lib/core/services/web_window_web.dart b/userfront/lib/core/services/web_window_web.dart
index 1f8f0c67..dc23777c 100644
--- a/userfront/lib/core/services/web_window_web.dart
+++ b/userfront/lib/core/services/web_window_web.dart
@@ -3,6 +3,10 @@
 import 'dart:html' as html;
 
 class WebWindow {
+  void setTitle(String title) {
+    html.document.title = title;
+  }
+
   void redirectTo(String url) {
     html.window.location.href = url;
   }
diff --git a/userfront/lib/core/widgets/language_selector.dart b/userfront/lib/core/widgets/language_selector.dart
new file mode 100644
index 00000000..3300ab79
--- /dev/null
+++ b/userfront/lib/core/widgets/language_selector.dart
@@ -0,0 +1,65 @@
+import 'package:easy_localization/easy_localization.dart' hide tr;
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:userfront/i18n.dart';
+
+import '../i18n/locale_storage.dart';
+import '../i18n/locale_utils.dart';
+
+class LanguageSelector extends StatelessWidget {
+  const LanguageSelector({super.key, this.compact = false});
+
+  final bool compact;
+
+  @override
+  Widget build(BuildContext context) {
+    final current = context.locale.languageCode;
+    final items = [
+      DropdownMenuItem(
+        value: 'ko',
+        child: Text(tr('ui.common.language_ko')),
+      ),
+      DropdownMenuItem(
+        value: 'en',
+        child: Text(tr('ui.common.language_en', fallback: 'English')),
+      ),
+    ];
+
+    final iconSize = compact ? 16.0 : 18.0;
+    final dropdown = DropdownButtonHideUnderline(
+      child: DropdownButton<String>(
+        value: current,
+        items: items,
+        isDense: true,
+        icon: Icon(Icons.arrow_drop_down, size: compact ? 18 : 20),
+        onChanged: (value) async {
+          if (value == null || value == current) {
+            return;
+          }
+          LocaleStorage.write(value);
+          await context.setLocale(Locale(value));
+          final uri = GoRouterState.of(context).uri;
+          final target = buildLocalizedPath(value, uri);
+          if (context.mounted) {
+            context.go(target);
+          }
+        },
+      ),
+    );
+
+    return Padding(
+      padding: EdgeInsets.only(top: compact ? 0 : 2),
+      child: ConstrainedBox(
+        constraints: BoxConstraints(minHeight: compact ? 24 : 28),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.language, size: iconSize),
+            const SizedBox(width: 6),
+            dropdown,
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/userfront/lib/features/auth/presentation/error_screen.dart b/userfront/lib/features/auth/presentation/error_screen.dart
index c3d8113b..d469b5ed 100644
--- a/userfront/lib/features/auth/presentation/error_screen.dart
+++ b/userfront/lib/features/auth/presentation/error_screen.dart
@@ -30,32 +30,33 @@ class ErrorScreen extends StatelessWidget {
         ? (isWhitelisted && hasCode ? normalizedCode : 'unknown_error')
         : (hasCode ? normalizedCode : 'unknown_error');
     final title = isProd
-        ? tr('msg.userfront.error.title', fallback: '인증 과정에서 오류가 발생했습니다')
+        ? tr('msg.userfront.error.title')
         : (hasCode
-            ? tr(
-                'msg.userfront.error.title_with_code',
-                fallback: '오류: {{code}}',
-                params: {'code': normalizedCode},
-              )
-            : tr('msg.userfront.error.title_generic', fallback: '오류가 발생했습니다'));
+              ? tr(
+                  'msg.userfront.error.title_with_code',
+                  params: {'code': normalizedCode},
+                )
+              : tr(
+                  'msg.userfront.error.title_generic',
+                ));
     final detail = isProd
         ? (isWhitelisted
-            ? tr(
-                'msg.userfront.error.whitelist.$normalizedCode',
-                fallback: whitelistFallback,
-              )
-            : tr(
-                'msg.userfront.error.detail_contact',
-                fallback: '에러가 계속되면 관리자에게 문의해주세요',
-              ))
+              ? tr(
+                  'msg.userfront.error.whitelist.$normalizedCode',
+                  fallback: whitelistFallback,
+                )
+              : tr(
+                  'msg.userfront.error.detail_contact',
+                ))
         : ((description?.isNotEmpty == true)
-            ? description!
-            : (hasCode
-                ? tr('msg.userfront.error.detail_generic', fallback: '오류가 발생했습니다.')
-                : tr(
-                    'msg.userfront.error.detail_request',
-                    fallback: '요청을 처리하는 중 문제가 발생했습니다.',
-                  )));
+              ? description!
+              : (hasCode
+                    ? tr(
+                        'msg.userfront.error.detail_generic',
+                      )
+                    : tr(
+                        'msg.userfront.error.detail_request',
+                      )));
 
     return Scaffold(
       backgroundColor: const Color(0xFFF7F8FA),
@@ -94,7 +95,6 @@ class ErrorScreen extends StatelessWidget {
                   Text(
                     tr(
                       'msg.userfront.error.type',
-                      fallback: '오류 종류: {{type}}',
                       params: {'type': errorType},
                     ),
                     style: theme.textTheme.bodySmall?.copyWith(
@@ -106,7 +106,6 @@ class ErrorScreen extends StatelessWidget {
                     Text(
                       tr(
                         'msg.userfront.error.id',
-                        fallback: '오류 ID: {{id}}',
                         params: {'id': errorId!},
                       ),
                       style: theme.textTheme.bodySmall?.copyWith(
@@ -124,27 +123,35 @@ class ErrorScreen extends StatelessWidget {
                         style: ElevatedButton.styleFrom(
                           backgroundColor: const Color(0xFF111827),
                           foregroundColor: Colors.white,
-                          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 12,
+                          ),
                           shape: RoundedRectangleBorder(
                             borderRadius: BorderRadius.circular(10),
                           ),
                         ),
                         child: Text(
-                          tr('ui.userfront.error.go_login', fallback: '로그인으로 이동'),
+                          tr(
+                            'ui.userfront.error.go_login',
+                          ),
                         ),
                       ),
                       OutlinedButton(
                         onPressed: () => context.go('/'),
                         style: OutlinedButton.styleFrom(
                           foregroundColor: const Color(0xFF111827),
-                          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 12,
+                          ),
                           side: const BorderSide(color: Color(0xFFCBD5F5)),
                           shape: RoundedRectangleBorder(
                             borderRadius: BorderRadius.circular(10),
                           ),
                         ),
                         child: Text(
-                          tr('ui.userfront.error.go_home', fallback: '홈으로 이동'),
+                          tr('ui.userfront.error.go_home'),
                         ),
                       ),
                     ],
diff --git a/userfront/lib/features/auth/presentation/forgot_password_screen.dart b/userfront/lib/features/auth/presentation/forgot_password_screen.dart
index 59ad5fd7..1ad9f96e 100644
--- a/userfront/lib/features/auth/presentation/forgot_password_screen.dart
+++ b/userfront/lib/features/auth/presentation/forgot_password_screen.dart
@@ -17,7 +17,9 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
   @override
   void initState() {
     super.initState();
-    _drySendEnabled = _parseBoolParam(Uri.base.queryParameters['drySend']) && !AuthProxyService.isProdEnv;
+    _drySendEnabled =
+        _parseBoolParam(Uri.base.queryParameters['drySend']) &&
+        !AuthProxyService.isProdEnv;
   }
 
   Future<void> _handlePasswordReset() async {
@@ -26,7 +28,6 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
       _showError(
         tr(
           'msg.userfront.forgot.input_required',
-          fallback: '이메일 또는 휴대폰 번호를 입력해주세요.',
         ),
       );
       return;
@@ -44,14 +45,16 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
     setState(() => _isLoading = true);
 
     try {
-      await AuthProxyService.initiatePasswordReset(loginId, drySend: _drySendEnabled);
+      await AuthProxyService.initiatePasswordReset(
+        loginId,
+        drySend: _drySendEnabled,
+      );
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
             content: Text(
               tr(
                 'msg.userfront.forgot.sent',
-                fallback: '비밀번호 재설정 링크가 전송되었습니다. 이메일 또는 SMS를 확인해주세요.',
               ),
             ),
             backgroundColor: Colors.green,
@@ -64,7 +67,6 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
         _showError(
           tr(
             'msg.userfront.forgot.error',
-            fallback: '전송에 실패했습니다: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -94,7 +96,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(tr('ui.userfront.forgot.title', fallback: '비밀번호 재설정')),
+        title: Text(tr('ui.userfront.forgot.title')),
         centerTitle: true,
       ),
       body: Center(
@@ -106,17 +108,17 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               Text(
-                tr('ui.userfront.forgot.heading', fallback: '비밀번호를 잊으셨나요?'),
-                style: TextStyle(
-                  fontSize: 28,
-                  fontWeight: FontWeight.bold,
-                ),
+                tr('ui.userfront.forgot.heading'),
+                style: TextStyle(fontSize: 28, fontWeight: FontWeight.bold),
                 textAlign: TextAlign.center,
               ),
               if (_drySendEnabled) ...[
                 const SizedBox(height: 12),
                 Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 12,
+                    vertical: 10,
+                  ),
                   decoration: BoxDecoration(
                     color: const Color(0xFFFFF3CD),
                     borderRadius: BorderRadius.circular(8),
@@ -124,15 +126,20 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
                   ),
                   child: Row(
                     children: [
-                      const Icon(Icons.warning_amber_rounded, color: Color(0xFF8A6D3B)),
+                      const Icon(
+                        Icons.warning_amber_rounded,
+                        color: Color(0xFF8A6D3B),
+                      ),
                       const SizedBox(width: 8),
                       Expanded(
                         child: Text(
                           tr(
                             'msg.userfront.forgot.dry_send',
-                            fallback: 'drySend 모드: 실제 이메일/SMS는 발송되지 않습니다.',
                           ),
-                          style: const TextStyle(color: Color(0xFF8A6D3B), fontSize: 12),
+                          style: const TextStyle(
+                            color: Color(0xFF8A6D3B),
+                            fontSize: 12,
+                          ),
                         ),
                       ),
                     ],
@@ -143,8 +150,6 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
               Text(
                 tr(
                   'msg.userfront.forgot.description',
-                  fallback:
-                      '계정과 연결된 이메일 주소 또는 휴대폰 번호를 입력하시면, 비밀번호를 재설정할 수 있는 링크를 보내드립니다.',
                 ),
                 textAlign: TextAlign.center,
                 style: const TextStyle(color: Colors.grey),
@@ -155,7 +160,6 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
                 decoration: InputDecoration(
                   labelText: tr(
                     'ui.userfront.forgot.input_label',
-                    fallback: '이메일 또는 휴대폰 번호',
                   ),
                   border: const OutlineInputBorder(),
                   prefixIcon: const Icon(Icons.person_outline),
@@ -172,13 +176,13 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
                     ? const SizedBox(
                         height: 20,
                         width: 20,
-                        child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                          color: Colors.white,
+                        ),
                       )
                     : Text(
-                        tr(
-                          'ui.userfront.forgot.submit',
-                          fallback: '재설정 링크 전송',
-                        ),
+                        tr('ui.userfront.forgot.submit'),
                       ),
               ),
             ],
diff --git a/userfront/lib/features/auth/presentation/login_screen.dart b/userfront/lib/features/auth/presentation/login_screen.dart
index 459b9363..a6c6579f 100644
--- a/userfront/lib/features/auth/presentation/login_screen.dart
+++ b/userfront/lib/features/auth/presentation/login_screen.dart
@@ -6,6 +6,7 @@ import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:userfront/i18n.dart';
+import '../../../core/widgets/language_selector.dart';
 import '../../../core/services/web_auth_integration.dart';
 import '../../../core/services/auth_proxy_service.dart';
 import '../../../core/services/auth_token_store.dart';
@@ -16,8 +17,14 @@ import '../../../core/services/web_window.dart';
 class LoginScreen extends ConsumerStatefulWidget {
   final String? verificationToken;
   final String? loginChallenge;
+  final String? redirectUrl;
 
-  const LoginScreen({super.key, this.verificationToken, this.loginChallenge});
+  const LoginScreen({
+    super.key,
+    this.verificationToken,
+    this.loginChallenge,
+    this.redirectUrl,
+  });
 
   @override
   ConsumerState<LoginScreen> createState() => _LoginScreenState();
@@ -27,7 +34,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     with SingleTickerProviderStateMixin {
   late TabController _tabController;
   final TextEditingController _linkIdController = TextEditingController();
-  final TextEditingController _passwordLoginIdController = TextEditingController();
+  final TextEditingController _passwordLoginIdController =
+      TextEditingController();
   final TextEditingController _passwordController = TextEditingController();
   String? _redirectUrl;
   String? _loginChallenge;
@@ -36,12 +44,15 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
   String? _qrImageBase64;
   String? _qrPendingRef;
   bool _isQrLoading = false;
+  bool _qrExpired = false;
   Timer? _qrPollingTimer;
   int _qrRemainingSeconds = 0;
   Timer? _qrCountdownTimer;
   int _qrPollIntervalMs = 2000;
-  final TextEditingController _shortCodePrefixController = TextEditingController();
-  final TextEditingController _shortCodeDigitsController = TextEditingController();
+  final TextEditingController _shortCodePrefixController =
+      TextEditingController();
+  final TextEditingController _shortCodeDigitsController =
+      TextEditingController();
   String? _linkPendingRef;
   String? _lastLinkLoginId;
   bool _lastLinkIsEmail = true;
@@ -49,20 +60,19 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
   Timer? _linkResendTimer;
   int _linkExpireSeconds = 0;
   Timer? _linkExpireTimer;
+  bool _linkExpired = false;
   bool _verificationOnly = false;
   bool _verificationApproved = false;
+  bool _dismissedOverlays = false;
   String _verificationMessage = '';
   String _verificationTitle = tr(
     'ui.userfront.login.verification.title',
-    fallback: '승인 완료',
   );
   String _verificationPageTitle = tr(
     'ui.userfront.login.verification.page_title',
-    fallback: '로그인 승인',
   );
   String _verificationActionLabel = tr(
     'ui.userfront.login.verification.action_label',
-    fallback: '확인',
   );
   Timer? _verificationRedirectTimer;
   bool _noticeHandled = false;
@@ -74,19 +84,35 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     super.initState();
     _tabController = TabController(length: 3, vsync: this, initialIndex: 1);
     _tabController.addListener(_handleTabSelection);
-    _drySendEnabled = _parseBoolParam(Uri.base.queryParameters['drySend']) && !AuthProxyService.isProdEnv;
+    _drySendEnabled =
+        _parseBoolParam(Uri.base.queryParameters['drySend']) &&
+        !AuthProxyService.isProdEnv;
+    _redirectUrl = widget.redirectUrl;
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       final uri = Uri.base;
-      _loginChallenge = widget.loginChallenge ?? uri.queryParameters['login_challenge'];
+
+      if (_redirectUrl == null) {
+        if (uri.queryParameters.containsKey('redirect_url')) {
+          _redirectUrl = uri.queryParameters['redirect_url'];
+        } else if (uri.queryParameters.containsKey('redirect_uri')) {
+          _redirectUrl = uri.queryParameters['redirect_uri'];
+        }
+      }
+
+      _loginChallenge =
+          widget.loginChallenge ?? uri.queryParameters['login_challenge'];
       final loginIdParam = uri.queryParameters['loginId'];
       final codeParam = uri.queryParameters['code'];
       final pendingRefParam = uri.queryParameters['pendingRef'];
-      final hasShortCodePath = uri.pathSegments.length >= 2 && uri.pathSegments.first == 'l';
+      final hasShortCodePath =
+          uri.pathSegments.length >= 2 && uri.pathSegments.first == 'l';
       final hasTokenParam = uri.queryParameters.containsKey('t');
-      final hasVerificationToken = widget.verificationToken != null || hasTokenParam;
+      final hasVerificationToken =
+          widget.verificationToken != null || hasTokenParam;
       final hasLoginCode = loginIdParam != null && codeParam != null;
-      _verificationOnly = hasVerificationToken || hasLoginCode || hasShortCodePath;
+      _verificationOnly =
+          hasVerificationToken || hasLoginCode || hasShortCodePath;
       final notice = uri.queryParameters['notice'];
 
       if (hasShortCodePath) {
@@ -104,7 +130,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showInfo(
           tr(
             'msg.userfront.login.qr_login_required',
-            fallback: '로그인 한 상태여야 QR 스캔으로 로그인 할 수 있습니다',
           ),
         );
       }
@@ -114,10 +139,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         if (!mounted) return;
         await _tryCookieSession();
       }
-
-      if (uri.queryParameters.containsKey('redirect_url')) {
-        _redirectUrl = uri.queryParameters['redirect_url'];
-      }
     });
   }
 
@@ -142,10 +163,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.cookie_check_failed',
-            fallback: '로그인 확인 실패: {{error}}',
-            params: {
-              'error': e.toString().replaceFirst('Exception: ', ''),
-            },
+            params: {'error': e.toString().replaceFirst('Exception: ', '')},
           ),
         );
       }
@@ -161,6 +179,19 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         return;
       }
     }
+
+    final token = AuthTokenStore.getToken();
+    if (token != null && token.isNotEmpty) {
+      if (WebAuthIntegration.isPopup() ||
+          (_redirectUrl != null && _redirectUrl!.isNotEmpty)) {
+        debugPrint(
+          "[Auth] Cookie session with external integration. Notifying...",
+        );
+        WebAuthIntegration.sendLoginSuccess(token);
+        return;
+      }
+    }
+
     if (mounted) {
       context.go('/');
     }
@@ -183,7 +214,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
 
     try {
       await AuthProxyService.checkCookieSession();
-      AuthTokenStore.setCookieMode(provider: AuthTokenStore.getProvider() ?? 'ory');
+      AuthTokenStore.setCookieMode(
+        provider: AuthTokenStore.getProvider() ?? 'ory',
+      );
       await _acceptOidcLoginAndRedirect();
     } catch (e) {
       debugPrint("[Auth] OIDC auto-accept cookie check failed: $e");
@@ -221,10 +254,20 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     _linkExpireTimer?.cancel();
     _linkExpireTimer = null;
     _linkExpireSeconds = 0;
+    _linkExpired = false;
     _shortCodePrefixController.clear();
     _shortCodeDigitsController.clear();
   }
 
+  void _dismissOverlays() {
+    if (!mounted || _dismissedOverlays) {
+      return;
+    }
+    _dismissedOverlays = true;
+    final navigator = Navigator.of(context, rootNavigator: true);
+    navigator.popUntil((route) => route is! PopupRoute);
+  }
+
   bool _parseBoolParam(String? value) {
     if (value == null) {
       return false;
@@ -261,8 +304,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       }
       timer.cancel();
       if (mounted) {
-        setState(_resetLinkLoginState);
-        context.go('/signin');
+        setState(() {
+          _linkExpired = true;
+        });
+        _showInfo(
+          tr('msg.userfront.login.link_timeout'),
+        );
       }
     });
   }
@@ -272,7 +319,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       final parts = jwt.split('.');
       if (parts.length != 3) return 'User';
 
-      final payload = utf8.decode(base64Url.decode(base64Url.normalize(parts[1])));
+      final payload = utf8.decode(
+        base64Url.decode(base64Url.normalize(parts[1])),
+      );
       final data = json.decode(payload);
       return data['name'] ?? data['email'] ?? data['sub'] ?? 'User';
     } catch (e) {
@@ -295,6 +344,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       _isQrLoading = true;
       _qrImageBase64 = null;
       _qrRemainingSeconds = 0;
+      _qrExpired = false;
     });
 
     try {
@@ -319,7 +369,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       _showError(
         tr(
           'msg.userfront.login.qr_init_failed',
-          fallback: 'QR 초기화에 실패했습니다: {{error}}',
           params: {'error': e.toString()},
         ),
       );
@@ -332,7 +381,17 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     _qrCountdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
       if (!mounted || _qrRemainingSeconds <= 0) {
         timer.cancel();
-        if (_qrRemainingSeconds <= 0) _stopQrPolling();
+        if (_qrRemainingSeconds <= 0) {
+          _stopQrPolling();
+          if (mounted) {
+            setState(() {
+              _qrExpired = true;
+            });
+            _showInfo(
+              tr('msg.userfront.login.qr_expired'),
+            );
+          }
+        }
         return;
       }
       setState(() {
@@ -343,65 +402,70 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
 
   void _startQrPolling() {
     _qrPollingTimer?.cancel();
-    _qrPollingTimer = Timer.periodic(Duration(milliseconds: _qrPollIntervalMs), (timer) async {
-      if (_qrPendingRef == null || !mounted || _qrRemainingSeconds <= 0) {
-        timer.cancel();
-        return;
-      }
+    _qrPollingTimer = Timer.periodic(
+      Duration(milliseconds: _qrPollIntervalMs),
+      (timer) async {
+        if (_qrPendingRef == null || !mounted || _qrRemainingSeconds <= 0) {
+          timer.cancel();
+          return;
+        }
 
-      try {
-        final res = await AuthProxyService.pollQrStatus(_qrPendingRef!);
-        if (res['error'] == 'slow_down') {
-          final interval = res['interval'];
-          if (interval is int && interval > 0) {
-            final nextIntervalMs = interval * 1000;
-            if (nextIntervalMs != _qrPollIntervalMs) {
-              _qrPollIntervalMs = nextIntervalMs;
+        try {
+          final res = await AuthProxyService.pollQrStatus(_qrPendingRef!);
+          if (res['error'] == 'slow_down') {
+            final interval = res['interval'];
+            if (interval is int && interval > 0) {
+              final nextIntervalMs = interval * 1000;
+              if (nextIntervalMs != _qrPollIntervalMs) {
+                _qrPollIntervalMs = nextIntervalMs;
+                timer.cancel();
+                _startQrPolling();
+                return;
+              }
+            } else {
+              _qrPollIntervalMs += 500;
               timer.cancel();
               _startQrPolling();
               return;
             }
-          } else {
-            _qrPollIntervalMs += 500;
-            timer.cancel();
-            _startQrPolling();
+          }
+          if (res['error'] == 'authorization_pending') {
             return;
           }
-        }
-        if (res['error'] == 'authorization_pending') {
-          return;
-        }
-        if (res['error'] == 'expired_token') {
-          timer.cancel();
-          _qrCountdownTimer?.cancel();
-          _showError(
-            tr(
-              'msg.userfront.login.qr_expired',
-              fallback: 'QR 세션이 만료되었습니다.',
-            ),
-          );
-          return;
-        }
-
-        if (res['status'] == 'ok') {
-          timer.cancel();
-          _qrCountdownTimer?.cancel();
-          final token = res['sessionJwt'] ?? res['token'];
-          if (token is String && token.isNotEmpty) {
-            _completeLoginFromToken(token);
-          } else {
+          if (res['error'] == 'expired_token') {
+            timer.cancel();
+            _qrCountdownTimer?.cancel();
+            if (mounted) {
+              setState(() {
+                _qrExpired = true;
+              });
+            }
             _showError(
-              tr(
-                'msg.userfront.login.token_missing',
-                fallback: '로그인 토큰을 확인할 수 없습니다.',
-              ),
+              tr('msg.userfront.login.qr_expired'),
             );
+            return;
           }
+
+          if (res['status'] == 'ok') {
+            timer.cancel();
+            _qrCountdownTimer?.cancel();
+            final token =
+                res['sessionJwt'] ?? res['sessionToken'] ?? res['token'];
+            if (token is String && token.isNotEmpty) {
+              _completeLoginFromToken(token);
+            } else {
+              _showError(
+                tr(
+                  'msg.userfront.login.token_missing',
+                ),
+              );
+            }
+          }
+        } catch (e) {
+          debugPrint("[QR] Polling error: $e");
         }
-      } catch (e) {
-        debugPrint("[QR] Polling error: $e");
-      }
-    });
+      },
+    );
   }
 
   void _stopQrPolling() {
@@ -469,21 +533,14 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     Duration redirectDelay = const Duration(seconds: 2),
   }) {
     if (!mounted) return;
-    final resolvedTitle = title ??
-        tr(
-          'ui.userfront.login.verification.title',
-          fallback: '승인 완료',
-        );
-    final resolvedPageTitle = pageTitle ??
-        tr(
-          'ui.userfront.login.verification.page_title',
-          fallback: '로그인 승인',
-        );
-    final resolvedActionLabel = actionLabel ??
-        tr(
-          'ui.userfront.login.verification.action_label',
-          fallback: '확인',
-        );
+    final resolvedTitle =
+        title ?? tr('ui.userfront.login.verification.title');
+    final resolvedPageTitle =
+        pageTitle ??
+        tr('ui.userfront.login.verification.page_title');
+    final resolvedActionLabel =
+        actionLabel ??
+        tr('ui.userfront.login.verification.action_label');
     setState(() {
       _verificationApproved = true;
       _verificationMessage = message;
@@ -507,18 +564,25 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            const Icon(Icons.check_circle_outline, color: Colors.green, size: 72),
+            const Icon(
+              Icons.check_circle_outline,
+              color: Colors.green,
+              size: 72,
+            ),
             const SizedBox(height: 16),
             Text(
               _verificationTitle,
-              style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: Colors.green),
+              style: const TextStyle(
+                fontSize: 22,
+                fontWeight: FontWeight.bold,
+                color: Colors.green,
+              ),
             ),
             const SizedBox(height: 12),
             Text(
               _verificationMessage.isEmpty
                   ? tr(
                       'msg.userfront.login.verification.success',
-                      fallback: '로그인 승인에 성공했습니다.',
                     )
                   : _verificationMessage,
               textAlign: TextAlign.center,
@@ -527,7 +591,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
             const SizedBox(height: 24),
             FilledButton(
               onPressed: () {
-                final hasLocalSession = AuthTokenStore.getToken() != null || AuthTokenStore.usesCookie();
+                final hasLocalSession =
+                    AuthTokenStore.getToken() != null ||
+                    AuthTokenStore.usesCookie();
                 final target = hasLocalSession ? '/' : '/signin';
                 if (mounted) {
                   setState(() {
@@ -549,11 +615,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     debugPrint("[Auth] Starting verification for token: $token");
     final approvedMessage = tr(
       'msg.userfront.login.verification.approved',
-      fallback: '승인되었습니다. 로그인은 요청하신 창에서 완료됩니다.',
     );
     final localSessionMessage = tr(
       'msg.userfront.login.verification.approved_local',
-      fallback: '승인 되었습니다. 이 기기는 로그인되어 있는 상태입니다. 원격 창도 로그인이 될 예정입니다',
     );
     try {
       // Use Backend to verify the token (Backend-Driven Flow)
@@ -562,17 +626,14 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         verifyOnly: _verificationOnly,
       );
       debugPrint("[Auth] Verification successful for token: $token");
-      final jwt = res['token'] ?? res['sessionJwt'];
+      final jwt = res['token'] ?? res['sessionJwt'] ?? res['sessionToken'];
       final status = res['status']?.toString();
       final hasLocalSession = await _hasValidLocalSession();
       final actionPath = hasLocalSession ? '/' : '/signin';
 
       if (status == 'approved' || (jwt == null && _verificationOnly)) {
         if (mounted) {
-          _markVerificationApproved(
-            approvedMessage,
-            actionPath: actionPath,
-          );
+          _markVerificationApproved(approvedMessage, actionPath: actionPath);
         }
         return;
       }
@@ -585,18 +646,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
           );
           return;
         }
-        _markVerificationApproved(
-          approvedMessage,
-          actionPath: actionPath,
-        );
+        _markVerificationApproved(approvedMessage, actionPath: actionPath);
         return;
       }
 
       if (mounted) {
-        _markVerificationApproved(
-          approvedMessage,
-          actionPath: actionPath,
-        );
+        _markVerificationApproved(approvedMessage, actionPath: actionPath);
       }
     } catch (e) {
       debugPrint("[Auth] Verification FAILED for token: $token. Error: $e");
@@ -604,7 +659,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.verification_failed',
-            fallback: '승인 처리에 실패했습니다: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -612,20 +666,23 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     }
   }
 
-  Future<void> _verifyLoginCode(String loginId, String code, {String? pendingRef}) async {
+  Future<void> _verifyLoginCode(
+    String loginId,
+    String code, {
+    String? pendingRef,
+  }) async {
     final sanitizedLoginId = loginId.replaceAll(' ', '+');
-    debugPrint("[Auth] Starting code verification for loginId: $sanitizedLoginId");
+    debugPrint(
+      "[Auth] Starting code verification for loginId: $sanitizedLoginId",
+    );
     final approvedMessage = tr(
       'msg.userfront.login.verification.approved',
-      fallback: '승인되었습니다. 로그인은 요청하신 창에서 완료됩니다.',
     );
     final localSessionMessage = tr(
       'msg.userfront.login.verification.approved_local',
-      fallback: '승인 되었습니다. 이 기기는 로그인되어 있는 상태입니다. 원격 창도 로그인이 될 예정입니다',
     );
     final linkLoginMessage = tr(
       'msg.userfront.login.link.approved',
-      fallback: '링크로 로그인 되었습니다. 잠시 후 로그인 화면으로 이동합니다.',
     );
     try {
       final res = await AuthProxyService.verifyLoginCode(
@@ -634,18 +691,17 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         pendingRef: pendingRef,
         verifyOnly: _verificationOnly,
       );
-      final jwt = res['sessionJwt'] ?? res['token'];
+      final jwt = res['sessionJwt'] ?? res['sessionToken'] ?? res['token'];
       final status = res['status']?.toString();
-      debugPrint("[Auth] Code verification successful for loginId: $sanitizedLoginId");
+      debugPrint(
+        "[Auth] Code verification successful for loginId: $sanitizedLoginId",
+      );
       final hasLocalSession = await _hasValidLocalSession();
       final actionPath = hasLocalSession ? '/' : '/signin';
 
       if (jwt == null && status == 'approved') {
         if (mounted) {
-          _markVerificationApproved(
-            approvedMessage,
-            actionPath: actionPath,
-          );
+          _markVerificationApproved(approvedMessage, actionPath: actionPath);
         }
         return;
       }
@@ -659,25 +715,17 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
           return;
         }
         if (_verificationOnly) {
-          _markVerificationApproved(
-            approvedMessage,
-            actionPath: actionPath,
-          );
+          _markVerificationApproved(approvedMessage, actionPath: actionPath);
           return;
         }
         _markVerificationApproved(
           linkLoginMessage,
-          title: tr(
-            'ui.userfront.login.link.title',
-            fallback: '링크 로그인 완료',
-          ),
+          title: tr('ui.userfront.login.link.title'),
           pageTitle: tr(
             'ui.userfront.login.link.page_title',
-            fallback: '링크 로그인',
           ),
           actionLabel: tr(
             'ui.userfront.login.link.action_label',
-            fallback: '로그인 화면으로 이동',
           ),
           actionPath: '/signin',
           autoRedirect: true,
@@ -686,18 +734,16 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       }
 
       if (_verificationOnly && mounted) {
-        _markVerificationApproved(
-          approvedMessage,
-          actionPath: actionPath,
-        );
+        _markVerificationApproved(approvedMessage, actionPath: actionPath);
       }
     } catch (e) {
-      debugPrint("[Auth] Code verification FAILED for loginId: $sanitizedLoginId. Error: $e");
+      debugPrint(
+        "[Auth] Code verification FAILED for loginId: $sanitizedLoginId. Error: $e",
+      );
       if (mounted) {
         _showError(
           tr(
             'msg.userfront.login.verification_failed',
-            fallback: '승인 처리에 실패했습니다: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -711,18 +757,16 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     debugPrint("[Auth] Starting short code verification for code: $sanitized");
     final approvedMessage = tr(
       'msg.userfront.login.verification.approved',
-      fallback: '승인되었습니다. 로그인은 요청하신 창에서 완료됩니다.',
     );
     final localSessionMessage = tr(
       'msg.userfront.login.verification.approved_local',
-      fallback: '승인 되었습니다. 이 기기는 로그인되어 있는 상태입니다. 원격 창도 로그인이 될 예정입니다',
     );
     try {
       final res = await AuthProxyService.verifyLoginShortCode(
         sanitized,
         verifyOnly: _verificationOnly,
       );
-      final jwt = res['sessionJwt'] ?? res['token'];
+      final jwt = res['sessionJwt'] ?? res['sessionToken'] ?? res['token'];
       final status = res['status']?.toString();
       debugPrint("[Auth] Short code verification successful");
       final hasLocalSession = await _hasValidLocalSession();
@@ -730,10 +774,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
 
       if (jwt == null && status == 'approved') {
         if (mounted) {
-          _markVerificationApproved(
-            approvedMessage,
-            actionPath: actionPath,
-          );
+          _markVerificationApproved(approvedMessage, actionPath: actionPath);
         }
         return;
       }
@@ -747,10 +788,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
           return;
         }
         if (_verificationOnly) {
-          _markVerificationApproved(
-            approvedMessage,
-            actionPath: actionPath,
-          );
+          _markVerificationApproved(approvedMessage, actionPath: actionPath);
           return;
         }
         _completeLoginFromToken(jwt, provider: res['provider'] as String?);
@@ -758,10 +796,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       }
 
       if (_verificationOnly && mounted) {
-        _markVerificationApproved(
-          approvedMessage,
-          actionPath: actionPath,
-        );
+        _markVerificationApproved(approvedMessage, actionPath: actionPath);
       }
     } catch (e) {
       debugPrint("[Auth] Short code verification FAILED. Error: $e");
@@ -769,7 +804,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.verification_failed',
-            fallback: '승인 처리에 실패했습니다: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -798,7 +832,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       _showError(
         tr(
           'msg.userfront.login.password.missing_credentials',
-          fallback: '이메일(또는 전화번호)와 비밀번호를 모두 입력해주세요.',
         ),
       );
       return;
@@ -812,20 +845,16 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       }
     }
 
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (context) => const Center(child: CircularProgressIndicator()),
-    );
-
     try {
-      final res = await AuthProxyService.loginWithPassword(loginId, password, loginChallenge: _loginChallenge);
-      final jwt = res['sessionJwt'];
+      final res = await AuthProxyService.loginWithPassword(
+        loginId,
+        password,
+        loginChallenge: _loginChallenge,
+      );
+      final jwt = res['sessionJwt'] ?? res['sessionToken'] ?? res['token'];
       final provider = res['provider'] as String?;
       final redirectTo = res['redirectTo'] as String?;
 
-      if (mounted) Navigator.of(context).pop();
-
       if (redirectTo != null && redirectTo.isNotEmpty) {
         webWindow.redirectTo(redirectTo);
         return;
@@ -835,17 +864,13 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _onLoginSuccess(jwt, provider: provider);
       }
     } catch (e) {
-      if (mounted) Navigator.of(context).pop();
       if (e.toString().contains("User not registered")) {
         _showUnregisteredDialog();
       } else {
         _showError(
           tr(
             'msg.userfront.login.password.failed',
-            fallback: '로그인 실패: {{error}}',
-            params: {
-              'error': e.toString().replaceFirst('Exception: ', ''),
-            },
+            params: {'error': e.toString().replaceFirst('Exception: ', '')},
           ),
         );
       }
@@ -875,7 +900,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.link_failed',
-            fallback: '오류: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -883,16 +907,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     }
   }
 
-  Future<void> _startEnchantedFlow(String loginId, {required bool isEmail, bool codeOnly = false}) async {
+  Future<void> _startEnchantedFlow(
+    String loginId, {
+    required bool isEmail,
+    bool codeOnly = false,
+  }) async {
     try {
-      if (mounted) {
-        showDialog(
-          context: context,
-          barrierDismissible: false,
-          builder: (context) => const Center(child: CircularProgressIndicator()),
-        );
-      }
-
       final initResponse = await AuthProxyService.initEnchantedLink(
         loginId,
         codeOnly: codeOnly,
@@ -904,25 +924,25 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       final interval = initResponse['interval'];
       final resendAfter = initResponse['resendAfter'];
       final expiresIn = initResponse['expiresIn'];
-      debugPrint("[Auth] Link Sent. PendingRef: $pendingRef, Mode: $mode, Provider: $provider");
+      debugPrint(
+        "[Auth] Link Sent. PendingRef: $pendingRef, Mode: $mode, Provider: $provider",
+      );
 
       if (mounted) {
         setState(() {
           _linkPendingRef = pendingRef?.toString();
           _lastLinkLoginId = loginId;
           _lastLinkIsEmail = isEmail;
+          _linkExpired = false;
         });
-        Navigator.of(context).pop();
-
+        _dismissOverlays();
         _showInfo(
           isEmail
               ? tr(
                   'msg.userfront.login.link_sent_email',
-                  fallback: '입력하신 이메일로 로그인 링크를 보냈습니다.',
                 )
               : tr(
                   'msg.userfront.login.link_sent_phone',
-                  fallback: '입력하신 번호로 로그인 링크를 보냈습니다.',
                 ),
         );
 
@@ -939,7 +959,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       }
     } catch (e) {
       debugPrint("[Auth] Initialization failed: $e");
-      if (mounted && Navigator.canPop(context)) Navigator.of(context).pop();
       if (mounted) {
         setState(_resetLinkLoginState);
       }
@@ -949,7 +968,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.link_send_failed',
-            fallback: '전송 실패: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -957,7 +975,10 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
     }
   }
 
-  Future<void> _pollForSession(String pendingRef, {Duration? initialInterval}) async {
+  Future<void> _pollForSession(
+    String pendingRef, {
+    Duration? initialInterval,
+  }) async {
     int attempts = 0;
     const maxAttempts = 60;
     var pollInterval = initialInterval ?? const Duration(seconds: 2);
@@ -991,7 +1012,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
             _showError(
               tr(
                 'msg.userfront.login.link_timeout',
-                fallback: '로그인 요청 시간이 초과되었습니다.',
               ),
             );
           }
@@ -999,7 +1019,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         }
 
         if (result['status'] == 'ok') {
-          final token = result['sessionJwt'] ?? result['token'];
+          final token =
+              result['sessionJwt'] ?? result['sessionToken'] ?? result['token'];
           if (token is String && token.isNotEmpty) {
             debugPrint("[Auth] Polling SUCCESS. Token received.");
             _completeLoginFromToken(
@@ -1016,7 +1037,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
           _showError(
             tr(
               'msg.userfront.login.token_missing',
-              fallback: '로그인 토큰을 확인할 수 없습니다.',
             ),
           );
           return;
@@ -1030,10 +1050,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       debugPrint("[Auth] Polling timed out for ref: $pendingRef");
       Navigator.of(context).pop();
       _showError(
-        tr(
-          'msg.userfront.login.link_timeout',
-          fallback: '로그인 요청 시간이 초과되었습니다.',
-        ),
+        tr('msg.userfront.login.link_timeout'),
       );
     }
   }
@@ -1091,6 +1108,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
 
     AuthTokenStore.setToken(token, provider: providerName);
     AuthTokenStore.clearPendingProvider();
+    _dismissOverlays();
 
     try {
       await ref.read(profileProvider.notifier).loadProfile();
@@ -1114,23 +1132,24 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
         _showError(
           tr(
             'msg.userfront.login.oidc_failed',
-            fallback: 'OIDC 로그인 처리에 실패했습니다. 다시 시도해 주세요.',
           ),
         );
         return;
       }
     }
 
-    if (WebAuthIntegration.isPopup()) {
-      debugPrint("[Auth] Popup detected. Notifying opener and attempting to close.");
+    final uri = Uri.base;
+    final redirectParam =
+        uri.queryParameters['redirect_uri'] ?? uri.queryParameters['redirect_url'];
+    final hasRedirectParam =
+        redirectParam != null && redirectParam.isNotEmpty;
+
+    if (WebAuthIntegration.isPopup() || hasRedirectParam) {
+      debugPrint(
+        "[Auth] External integration detected (popup or redirect). Notifying...",
+      );
       WebAuthIntegration.sendLoginSuccess(token);
-    } else {
-      if (_redirectUrl != null && _redirectUrl!.isNotEmpty) {
-        debugPrint("[Auth] Redirecting standalone window to: $_redirectUrl");
-        final target = "$_redirectUrl?token=$token";
-        launchUrlString(target, webOnlyWindowName: '_self');
-        return;
-      }
+      return;
     }
 
     debugPrint("[Auth] Login success. Navigating to root.");
@@ -1145,18 +1164,17 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
       context: context,
       builder: (context) => AlertDialog(
         title: Text(
-          tr('ui.userfront.login.unregistered.title', fallback: '미등록 회원'),
+          tr('ui.userfront.login.unregistered.title'),
         ),
         content: Text(
           tr(
             'msg.userfront.login.unregistered.body',
-            fallback: '가입되지 않은 정보입니다.\n회원가입 후 이용해 주세요.',
           ),
         ),
         actions: [
           TextButton(
             onPressed: () => Navigator.pop(context),
-            child: Text(tr('ui.common.cancel', fallback: '취소')),
+            child: Text(tr('ui.common.cancel')),
           ),
           FilledButton(
             onPressed: () {
@@ -1165,7 +1183,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
               context.push('/signup');
             },
             child: Text(
-              tr('ui.userfront.login.unregistered.action', fallback: '회원가입 하기'),
+              tr('ui.userfront.login.unregistered.action'),
             ),
           ),
         ],
@@ -1203,7 +1221,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       Text(
-                        tr('ui.userfront.app_title', fallback: 'Baron 로그인'),
+                        tr('ui.userfront.app_title'),
                         style: const TextStyle(
                           fontSize: 32,
                           fontWeight: FontWeight.bold,
@@ -1213,7 +1231,10 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                       if (_drySendEnabled) ...[
                         const SizedBox(height: 16),
                         Container(
-                          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12,
+                            vertical: 10,
+                          ),
                           decoration: BoxDecoration(
                             color: const Color(0xFFFFF3CD),
                             borderRadius: BorderRadius.circular(8),
@@ -1221,13 +1242,15 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                           ),
                           child: Row(
                             children: [
-                              const Icon(Icons.warning_amber_rounded, color: Color(0xFF8A6D3B)),
+                              const Icon(
+                                Icons.warning_amber_rounded,
+                                color: Color(0xFF8A6D3B),
+                              ),
                               const SizedBox(width: 8),
                               Expanded(
                                 child: Text(
                                   tr(
                                     'msg.userfront.login.dry_send',
-                                    fallback: 'drySend 모드: 실제 이메일/SMS는 발송되지 않습니다.',
                                   ),
                                   style: const TextStyle(
                                     color: Color(0xFF8A6D3B),
@@ -1247,19 +1270,16 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                           Tab(
                             text: tr(
                               'ui.userfront.login.tabs.password',
-                              fallback: '비밀번호',
                             ),
                           ),
                           Tab(
                             text: tr(
                               'ui.userfront.login.tabs.link',
-                              fallback: '로그인 링크',
                             ),
                           ),
                           Tab(
                             text: tr(
                               'ui.userfront.login.tabs.qr',
-                              fallback: 'QR 코드',
                             ),
                           ),
                         ],
@@ -1280,10 +1300,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                     decoration: InputDecoration(
                                       labelText: tr(
                                         'ui.userfront.login.field.login_id',
-                                        fallback: '이메일 또는 휴대폰 번호',
                                       ),
                                       border: const OutlineInputBorder(),
-                                      prefixIcon: const Icon(Icons.person_outline),
+                                      prefixIcon: const Icon(
+                                        Icons.person_outline,
+                                      ),
                                     ),
                                     onSubmitted: (_) => _handlePasswordLogin(),
                                   ),
@@ -1294,10 +1315,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                     decoration: InputDecoration(
                                       labelText: tr(
                                         'ui.userfront.login.field.password',
-                                        fallback: '비밀번호',
                                       ),
                                       border: const OutlineInputBorder(),
-                                      prefixIcon: const Icon(Icons.lock_outline),
+                                      prefixIcon: const Icon(
+                                        Icons.lock_outline,
+                                      ),
                                     ),
                                     onSubmitted: (_) => _handlePasswordLogin(),
                                   ),
@@ -1308,7 +1330,9 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                       minimumSize: const Size.fromHeight(50),
                                     ),
                                     child: Text(
-                                      tr('ui.userfront.login.action.submit', fallback: '로그인'),
+                                      tr(
+                                        'ui.userfront.login.action.submit',
+                                      ),
                                     ),
                                   ),
                                 ],
@@ -1325,11 +1349,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                       decoration: InputDecoration(
                                         labelText: tr(
                                           'ui.userfront.login.field.login_id',
-                                          fallback: '이메일 또는 휴대폰 번호',
                                         ),
                                         hintText: '',
                                         border: const OutlineInputBorder(),
-                                        prefixIcon: const Icon(Icons.person_outline),
+                                        prefixIcon: const Icon(
+                                          Icons.person_outline,
+                                        ),
                                       ),
                                       onSubmitted: (_) => _handleLinkLogin(),
                                     ),
@@ -1342,7 +1367,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                       child: Text(
                                         tr(
                                           'ui.userfront.login.link.send',
-                                          fallback: '로그인 링크 전송',
                                         ),
                                       ),
                                     ),
@@ -1350,184 +1374,232 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                     Text(
                                       tr(
                                         'msg.userfront.login.link.helper',
-                                        fallback: '입력하신 정보로 로그인 링크를 전송합니다.',
                                       ),
-                                      style: const TextStyle(color: Colors.grey, fontSize: 12),
+                                      style: const TextStyle(
+                                        color: Colors.grey,
+                                        fontSize: 12,
+                                      ),
                                       textAlign: TextAlign.center,
                                     ),
                                   ],
                                   if (_linkPendingRef != null) ...[
-                                    Text(
-                                      tr(
-                                        'msg.userfront.login.link.short_code_help',
-                                        fallback: '링크로 받은 값의 뒤 문자 2개와 숫자 6자리를 입력하셔도 로그인 할 수 있습니다.',
-                                      ),
-                                      style: const TextStyle(color: Colors.grey, fontSize: 12),
-                                      textAlign: TextAlign.center,
-                                    ),
-                                    const SizedBox(height: 12),
-                                    Row(
-                                      children: [
-                                        Expanded(
-                                          flex: 2,
-                                          child: TextField(
-                                            controller: _shortCodePrefixController,
-                                            textCapitalization: TextCapitalization.characters,
-                                            decoration: InputDecoration(
-                                              labelText: tr(
-                                                'ui.userfront.login.short_code.prefix',
-                                                fallback: '영문 2자리',
-                                              ),
-                                              border: const OutlineInputBorder(),
-                                              hintText: 'AB',
-                                              hintStyle: const TextStyle(color: Colors.grey),
-                                            ),
-                                            maxLength: 2,
-                                          ),
+                                    if (_linkExpired) ...[
+                                      Text(
+                                        tr('msg.userfront.login.link_timeout'),
+                                        textAlign: TextAlign.center,
+                                        style: const TextStyle(
+                                          color: Colors.grey,
+                                          fontSize: 12,
                                         ),
-                                        const SizedBox(width: 8),
-                                        Expanded(
-                                          flex: 4,
-                                          child: TextField(
-                                            controller: _shortCodeDigitsController,
-                                            keyboardType: TextInputType.number,
-                                            decoration: InputDecoration(
-                                              labelText: tr(
-                                                'ui.userfront.login.short_code.digits',
-                                                fallback: '숫자 6자리',
-                                              ),
-                                              border: const OutlineInputBorder(),
-                                              hintText: '345678',
-                                              hintStyle: const TextStyle(color: Colors.grey),
-                                              suffixText: _linkExpireSeconds > 0
-                                                  ? tr(
-                                                      'ui.userfront.login.short_code.expire_time',
-                                                      fallback: '유효시간 {{time}}',
-                                                      params: {
-                                                        'time': _formatTime(_linkExpireSeconds),
-                                                      },
-                                                    )
-                                                  : null,
-                                            ),
-                                            maxLength: 6,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                    const SizedBox(height: 12),
-                                    FilledButton(
-                                      onPressed: () {
-                                        final prefix = _shortCodePrefixController.text.trim().toUpperCase();
-                                        final digits = _shortCodeDigitsController.text.trim();
-                                        if (prefix.length != 2 || digits.length != 6) {
-                                          _showError(
-                                            tr(
-                                              'msg.userfront.login.short_code.invalid',
-                                              fallback: '문자 2개와 숫자 6자리를 입력해 주세요.',
-                                            ),
-                                          );
-                                          return;
-                                        }
-                                        _verifyShortCode(prefix + digits);
-                                      },
-                                      style: FilledButton.styleFrom(
-                                        minimumSize: const Size.fromHeight(45),
                                       ),
-                                      child: Text(
+                                      const SizedBox(height: 12),
+                                      FilledButton(
+                                        onPressed: () {
+                                          setState(_resetLinkLoginState);
+                                        },
+                                        style: FilledButton.styleFrom(
+                                          minimumSize:
+                                              const Size.fromHeight(45),
+                                        ),
+                                        child: Text(tr('ui.common.refresh')),
+                                      ),
+                                    ] else ...[
+                                      Text(
                                         tr(
-                                          'ui.userfront.login.short_code.submit',
-                                          fallback: '코드로 로그인',
+                                          'msg.userfront.login.link.short_code_help',
+                                        ),
+                                        style: const TextStyle(
+                                          color: Colors.grey,
+                                          fontSize: 12,
+                                        ),
+                                        textAlign: TextAlign.center,
+                                      ),
+                                      const SizedBox(height: 12),
+                                      Row(
+                                        children: [
+                                          Expanded(
+                                            flex: 2,
+                                            child: TextField(
+                                              controller:
+                                                  _shortCodePrefixController,
+                                              textCapitalization:
+                                                  TextCapitalization.characters,
+                                              decoration: InputDecoration(
+                                                labelText: tr(
+                                                  'ui.userfront.login.short_code.prefix',
+                                                ),
+                                                border:
+                                                    const OutlineInputBorder(),
+                                                hintText: 'AB',
+                                                hintStyle: const TextStyle(
+                                                  color: Colors.grey,
+                                                ),
+                                              ),
+                                              maxLength: 2,
+                                            ),
+                                          ),
+                                          const SizedBox(width: 8),
+                                          Expanded(
+                                            flex: 4,
+                                            child: TextField(
+                                              controller:
+                                                  _shortCodeDigitsController,
+                                              keyboardType:
+                                                  TextInputType.number,
+                                              decoration: InputDecoration(
+                                                labelText: tr(
+                                                  'ui.userfront.login.short_code.digits',
+                                                ),
+                                                border:
+                                                    const OutlineInputBorder(),
+                                                hintText: '345678',
+                                                hintStyle: const TextStyle(
+                                                  color: Colors.grey,
+                                                ),
+                                                suffixText:
+                                                    _linkExpireSeconds > 0
+                                                        ? tr(
+                                                            'ui.userfront.login.short_code.expire_time',
+                                                            params: {
+                                                              'time': _formatTime(
+                                                                _linkExpireSeconds,
+                                                              ),
+                                                            },
+                                                          )
+                                                        : null,
+                                              ),
+                                              maxLength: 6,
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                      const SizedBox(height: 12),
+                                      FilledButton(
+                                        onPressed: () {
+                                          final prefix =
+                                              _shortCodePrefixController.text
+                                                  .trim()
+                                                  .toUpperCase();
+                                          final digits =
+                                              _shortCodeDigitsController.text
+                                                  .trim();
+                                          if (prefix.length != 2 ||
+                                              digits.length != 6) {
+                                            _showError(
+                                              tr(
+                                                'msg.userfront.login.short_code.invalid',
+                                              ),
+                                            );
+                                            return;
+                                          }
+                                          _verifyShortCode(prefix + digits);
+                                        },
+                                        style: FilledButton.styleFrom(
+                                          minimumSize:
+                                              const Size.fromHeight(45),
+                                        ),
+                                        child: Text(
+                                          tr(
+                                            'ui.userfront.login.short_code.submit',
+                                          ),
                                         ),
                                       ),
-                                    ),
-                                    const SizedBox(height: 12),
-                                    TextButton(
-                                      onPressed: () {
-                                        if (_linkResendSeconds > 0) {
-                                          _showInfo(
-                                            tr(
-                                              'msg.userfront.login.link.resend_wait',
-                                              fallback: '재발송은 {{time}} 후 가능합니다.',
-                                              params: {
-                                                'time': _formatTime(_linkResendSeconds),
-                                              },
-                                            ),
-                                          );
-                                          return;
-                                        }
-                                        final loginId = _lastLinkLoginId ?? _linkIdController.text.trim();
-                                        if (loginId.isEmpty) {
-                                          _showError(
-                                            tr(
-                                              'msg.userfront.login.link.missing_login_id',
-                                              fallback: '이메일 또는 휴대폰 번호를 입력해 주세요.',
-                                            ),
-                                          );
-                                          return;
-                                        }
-                                        _startEnchantedFlow(
-                                          loginId,
-                                          isEmail: _lastLinkIsEmail || loginId.contains('@'),
-                                          codeOnly: false,
-                                        );
-                                      },
-                                      child: Text(
-                                        _linkResendSeconds > 0
-                                            ? tr(
-                                                'ui.userfront.login.link.resend_with_time',
-                                                fallback: '재발송 ({{time}})',
-                                                params: {
-                                                  'time': _formatTime(_linkResendSeconds),
-                                                },
-                                              )
-                                            : tr(
-                                                'ui.common.resend',
-                                                fallback: '재발송',
-                                              ),
-                                      ),
-                                    ),
-                                    if (!_lastLinkIsEmail) ...[
-                                      const SizedBox(height: 4),
+                                      const SizedBox(height: 12),
                                       TextButton(
                                         onPressed: () {
                                           if (_linkResendSeconds > 0) {
                                             _showInfo(
                                               tr(
                                                 'msg.userfront.login.link.resend_wait',
-                                                fallback: '재발송은 {{time}} 후 가능합니다.',
                                                 params: {
-                                                  'time': _formatTime(_linkResendSeconds),
+                                                  'time': _formatTime(
+                                                    _linkResendSeconds,
+                                                  ),
                                                 },
                                               ),
                                             );
                                             return;
                                           }
-                                          final loginId = _lastLinkLoginId ?? _linkIdController.text.trim();
+                                          final loginId =
+                                              _lastLinkLoginId ??
+                                              _linkIdController.text.trim();
                                           if (loginId.isEmpty) {
                                             _showError(
                                               tr(
-                                                'msg.userfront.login.link.missing_phone',
-                                                fallback: '휴대폰 번호를 입력해 주세요.',
+                                                'msg.userfront.login.link.missing_login_id',
                                               ),
                                             );
                                             return;
                                           }
                                           _startEnchantedFlow(
                                             loginId,
-                                            isEmail: false,
-                                            codeOnly: true,
+                                            isEmail:
+                                                _lastLinkIsEmail ||
+                                                loginId.contains('@'),
+                                            codeOnly: false,
                                           );
                                         },
                                         child: Text(
-                                          tr(
-                                            'ui.userfront.login.link.code_only',
-                                            fallback: '코드만 받기({{time}})',
-                                            params: {
-                                              'time': _formatTime(_linkResendSeconds),
-                                            },
-                                          ),
+                                          _linkResendSeconds > 0
+                                              ? tr(
+                                                  'ui.userfront.login.link.resend_with_time',
+                                                  params: {
+                                                    'time': _formatTime(
+                                                      _linkResendSeconds,
+                                                    ),
+                                                  },
+                                                )
+                                              : tr(
+                                                  'ui.common.resend',
+                                                ),
                                         ),
                                       ),
+                                      if (!_lastLinkIsEmail) ...[
+                                        const SizedBox(height: 4),
+                                        TextButton(
+                                          onPressed: () {
+                                            if (_linkResendSeconds > 0) {
+                                              _showInfo(
+                                                tr(
+                                                  'msg.userfront.login.link.resend_wait',
+                                                  params: {
+                                                    'time': _formatTime(
+                                                      _linkResendSeconds,
+                                                    ),
+                                                  },
+                                                ),
+                                              );
+                                              return;
+                                            }
+                                            final loginId =
+                                                _lastLinkLoginId ??
+                                                _linkIdController.text.trim();
+                                            if (loginId.isEmpty) {
+                                              _showError(
+                                                tr(
+                                                  'msg.userfront.login.link.missing_phone',
+                                                ),
+                                              );
+                                              return;
+                                            }
+                                            _startEnchantedFlow(
+                                              loginId,
+                                              isEmail: false,
+                                              codeOnly: true,
+                                            );
+                                          },
+                                          child: Text(
+                                            tr(
+                                              'ui.userfront.login.link.code_only',
+                                              params: {
+                                                'time': _formatTime(
+                                                  _linkResendSeconds,
+                                                ),
+                                              },
+                                            ),
+                                          ),
+                                        ),
+                                      ],
                                     ],
                                   ],
                                 ],
@@ -1540,15 +1612,42 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                               children: [
                                 if (_isQrLoading)
                                   const CircularProgressIndicator()
+                                else if (_qrExpired)
+                                  Column(
+                                    children: [
+                                      Text(
+                                        tr('msg.userfront.login.qr_expired'),
+                                        textAlign: TextAlign.center,
+                                        style: const TextStyle(
+                                          color: Colors.grey,
+                                          fontSize: 12,
+                                        ),
+                                      ),
+                                      const SizedBox(height: 12),
+                                      FilledButton(
+                                        onPressed: _startQrFlow,
+                                        style: FilledButton.styleFrom(
+                                          minimumSize:
+                                              const Size.fromHeight(45),
+                                        ),
+                                        child: Text(tr('ui.common.refresh')),
+                                      ),
+                                    ],
+                                  )
                                 else if (_qrImageBase64 != null)
                                   Column(
-                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.center,
                                     children: [
                                       Container(
                                         padding: const EdgeInsets.all(16),
                                         decoration: BoxDecoration(
-                                          border: Border.all(color: Colors.grey.shade300),
-                                          borderRadius: BorderRadius.circular(12),
+                                          border: Border.all(
+                                            color: Colors.grey.shade300,
+                                          ),
+                                          borderRadius: BorderRadius.circular(
+                                            12,
+                                          ),
                                         ),
                                         child: QrImageView(
                                           data: _qrImageBase64!,
@@ -1559,20 +1658,22 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                       const SizedBox(height: 12),
                                       Text(
                                         _qrRemainingSeconds > 0
-                                          ? tr(
-                                              'ui.userfront.login.qr.remaining',
-                                              fallback: '남은 시간: {{time}}',
-                                              params: {
-                                                'time': _formatTime(_qrRemainingSeconds),
-                                              },
-                                            )
-                                          : tr(
-                                              'ui.userfront.login.qr.expired',
-                                              fallback: 'QR 코드 만료됨',
-                                            ),
+                                            ? tr(
+                                                'ui.userfront.login.qr.remaining',
+                                                params: {
+                                                  'time': _formatTime(
+                                                    _qrRemainingSeconds,
+                                                  ),
+                                                },
+                                              )
+                                            : tr(
+                                                'ui.userfront.login.qr.expired',
+                                              ),
                                         textAlign: TextAlign.center,
                                         style: TextStyle(
-                                          color: _qrRemainingSeconds > 30 ? Colors.blue : Colors.red,
+                                          color: _qrRemainingSeconds > 30
+                                              ? Colors.blue
+                                              : Colors.red,
                                           fontWeight: FontWeight.bold,
                                         ),
                                       ),
@@ -1580,17 +1681,18 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                       Text(
                                         tr(
                                           'msg.userfront.login.qr.scan_hint',
-                                          fallback: '모바일 앱으로 스캔하세요',
                                         ),
                                         textAlign: TextAlign.center,
-                                        style: const TextStyle(color: Colors.grey, fontSize: 12),
+                                        style: const TextStyle(
+                                          color: Colors.grey,
+                                          fontSize: 12,
+                                        ),
                                       ),
                                       TextButton(
                                         onPressed: _startQrFlow,
                                         child: Text(
                                           tr(
                                             'ui.userfront.login.qr.refresh',
-                                            fallback: 'QR 코드 새로고침',
                                           ),
                                         ),
                                       ),
@@ -1600,7 +1702,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                                   Text(
                                     tr(
                                       'msg.userfront.login.qr.load_failed',
-                                      fallback: 'QR 코드를 불러오지 못했습니다.',
                                     ),
                                     textAlign: TextAlign.center,
                                   ),
@@ -1617,7 +1718,6 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                             child: Text(
                               tr(
                                 'ui.userfront.login.forgot_password',
-                                fallback: '비밀번호를 잊으셨나요?',
                               ),
                             ),
                           ),
@@ -1627,16 +1727,17 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                               Text(
                                 tr(
                                   'msg.userfront.login.no_account',
-                                  fallback: '계정이 없으신가요?',
                                 ),
-                                style: const TextStyle(color: Colors.grey, fontSize: 14),
+                                style: const TextStyle(
+                                  color: Colors.grey,
+                                  fontSize: 14,
+                                ),
                               ),
                               TextButton(
                                 onPressed: () => context.push('/signup'),
                                 child: Text(
                                   tr(
                                     'ui.userfront.login.signup',
-                                    fallback: '회원가입',
                                   ),
                                 ),
                               ),
@@ -1644,6 +1745,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
                           ),
                         ],
                       ),
+                      const SizedBox(height: 6),
+                      const Align(
+                        alignment: Alignment.center,
+                        child: LanguageSelector(),
+                      ),
                     ],
                   ),
                 ),
diff --git a/userfront/lib/features/auth/presentation/login_success_screen.dart b/userfront/lib/features/auth/presentation/login_success_screen.dart
index a492f9b4..d4ad69de 100644
--- a/userfront/lib/features/auth/presentation/login_success_screen.dart
+++ b/userfront/lib/features/auth/presentation/login_success_screen.dart
@@ -14,23 +14,26 @@ class LoginSuccessScreen extends StatelessWidget {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              const Icon(Icons.check_circle_outline, size: 80, color: Colors.green),
+              const Icon(
+                Icons.check_circle_outline,
+                size: 80,
+                color: Colors.green,
+              ),
               const SizedBox(height: 24),
               Text(
-                tr('ui.userfront.login_success.title', fallback: '로그인 완료'),
-                style: TextStyle(
-                  fontSize: 32,
-                  fontWeight: FontWeight.bold,
-                ),
+                tr('ui.userfront.login_success.title'),
+                style: TextStyle(fontSize: 32, fontWeight: FontWeight.bold),
               ),
               const SizedBox(height: 16),
               Text(
-                tr('msg.userfront.login_success.subtitle', fallback: '성공적으로 로그인되었습니다.'),
+                tr(
+                  'msg.userfront.login_success.subtitle',
+                ),
                 textAlign: TextAlign.center,
                 style: const TextStyle(color: Colors.grey, fontSize: 16),
               ),
               const SizedBox(height: 48),
-              
+
               // 이 버튼이 QR 카메라를 켜는 버튼입니다.
               FilledButton.icon(
                 onPressed: () {
@@ -38,12 +41,17 @@ class LoginSuccessScreen extends StatelessWidget {
                 },
                 icon: const Icon(Icons.camera_alt, size: 28),
                 label: Text(
-                  tr('ui.userfront.login_success.qr', fallback: 'QR 인증 (카메라 켜기)'),
+                  tr(
+                    'ui.userfront.login_success.qr',
+                  ),
                 ),
                 style: FilledButton.styleFrom(
                   minimumSize: const Size.fromHeight(80), // 버튼 높이를 더 크게
                   backgroundColor: Colors.blue.shade700,
-                  textStyle: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                  textStyle: const TextStyle(
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                  ),
                   shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(16),
                   ),
@@ -57,7 +65,6 @@ class LoginSuccessScreen extends StatelessWidget {
                 child: Text(
                   tr(
                     'ui.userfront.login_success.later',
-                    fallback: '나중에 하기 (대시보드로 이동)',
                   ),
                   style: const TextStyle(color: Colors.grey),
                 ),
diff --git a/userfront/lib/features/auth/presentation/qr_scan_screen.dart b/userfront/lib/features/auth/presentation/qr_scan_screen.dart
index 3aa5b6b6..0d82f5d3 100644
--- a/userfront/lib/features/auth/presentation/qr_scan_screen.dart
+++ b/userfront/lib/features/auth/presentation/qr_scan_screen.dart
@@ -87,7 +87,7 @@ class _QRScanScreenState extends State<QRScanScreen> {
 
   Future<void> _onDetect(BarcodeCapture capture) async {
     if (_isScanned) return;
-    
+
     final List<Barcode> barcodes = capture.barcodes;
     for (final barcode in barcodes) {
       if (barcode.rawValue != null) {
@@ -119,7 +119,7 @@ class _QRScanScreenState extends State<QRScanScreen> {
 
         _log.info('QR Code detected raw: $qrData, ref: $pendingRef');
         final approveRef = qrData;
-        
+
         final storedToken = AuthTokenStore.getToken();
         final sessionToken = storedToken;
         var usesCookie = AuthTokenStore.usesCookie();
@@ -140,13 +140,12 @@ class _QRScanScreenState extends State<QRScanScreen> {
             token: sessionToken,
             withCredentials: usesCookie,
           );
-          
+
           if (mounted) {
             setState(() {
               _isSuccess = true;
               _resultMessage = tr(
                 'msg.userfront.qr.approve_success',
-                fallback: 'QR 승인 완료! PC 화면에서 로그인이 진행됩니다.',
               );
               _isProcessing = false;
             });
@@ -158,7 +157,6 @@ class _QRScanScreenState extends State<QRScanScreen> {
               _isSuccess = false;
               _resultMessage = tr(
                 'msg.userfront.qr.approve_error',
-                fallback: 'QR 승인 실패: {{error}}',
                 params: {'error': '$e'},
               );
               _isProcessing = false;
@@ -193,7 +191,6 @@ class _QRScanScreenState extends State<QRScanScreen> {
             content: Text(
               tr(
                 'msg.userfront.qr.permission_error',
-                fallback: '카메라 권한 요청에 실패했습니다. 브라우저/OS 설정을 확인해주세요.',
               ),
             ),
             backgroundColor: Colors.red,
@@ -212,8 +209,8 @@ class _QRScanScreenState extends State<QRScanScreen> {
     final icon = success ? Icons.check_circle_outline : Icons.error_outline;
     final color = success ? Colors.green : Colors.red;
     final title = success
-        ? tr('ui.userfront.qr.result_success', fallback: '승인 완료')
-        : tr('ui.userfront.qr.result_failure', fallback: '승인 실패');
+        ? tr('ui.userfront.qr.result_success')
+        : tr('ui.userfront.qr.result_failure');
     final message = _resultMessage ?? '';
 
     return Center(
@@ -226,7 +223,11 @@ class _QRScanScreenState extends State<QRScanScreen> {
             const SizedBox(height: 16),
             Text(
               title,
-              style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: color),
+              style: TextStyle(
+                fontSize: 22,
+                fontWeight: FontWeight.bold,
+                color: color,
+              ),
             ),
             const SizedBox(height: 12),
             Text(
@@ -238,12 +239,12 @@ class _QRScanScreenState extends State<QRScanScreen> {
             if (!success)
               FilledButton(
                 onPressed: _resetScan,
-                child: Text(tr('ui.userfront.qr.rescan', fallback: '다시 스캔')),
+                child: Text(tr('ui.userfront.qr.rescan')),
               ),
             if (success)
               FilledButton(
                 onPressed: () => context.pop(),
-                child: Text(tr('ui.common.close', fallback: '닫기')),
+                child: Text(tr('ui.common.close')),
               ),
           ],
         ),
@@ -268,7 +269,8 @@ class _QRScanScreenState extends State<QRScanScreen> {
                   controller: controller,
                   onDetect: _onDetect,
                   errorBuilder: (context, error) {
-                    final isPermissionDenied = error.errorCode ==
+                    final isPermissionDenied =
+                        error.errorCode ==
                         MobileScannerErrorCode.permissionDenied;
                     return Center(
                       child: Column(
@@ -280,11 +282,9 @@ class _QRScanScreenState extends State<QRScanScreen> {
                             isPermissionDenied
                                 ? tr(
                                     'msg.userfront.qr.permission_required',
-                                    fallback: '카메라 권한이 필요합니다.',
                                   )
                                 : tr(
                                     'msg.userfront.qr.camera_error',
-                                    fallback: '카메라 오류: {{error}}',
                                     params: {'error': '${error.errorCode}'},
                                   ),
                           ),
@@ -295,10 +295,11 @@ class _QRScanScreenState extends State<QRScanScreen> {
                                 : _requestCameraPermission,
                             child: Text(
                               _isRequestingCamera
-                                  ? tr('ui.common.requesting', fallback: '요청 중...')
+                                  ? tr(
+                                      'ui.common.requesting',
+                                    )
                                   : tr(
                                       'ui.userfront.qr.request_permission',
-                                      fallback: '카메라 권한 요청하기',
                                     ),
                             ),
                           ),
diff --git a/userfront/lib/features/auth/presentation/reset_password_screen.dart b/userfront/lib/features/auth/presentation/reset_password_screen.dart
index fa78d16a..2521bb79 100644
--- a/userfront/lib/features/auth/presentation/reset_password_screen.dart
+++ b/userfront/lib/features/auth/presentation/reset_password_screen.dart
@@ -13,7 +13,8 @@ class ResetPasswordScreen extends StatefulWidget {
 
 class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
   final TextEditingController _passwordController = TextEditingController();
-  final TextEditingController _confirmPasswordController = TextEditingController();
+  final TextEditingController _confirmPasswordController =
+      TextEditingController();
   final _formKey = GlobalKey<FormState>();
   bool _isLoading = false;
   String? _loginId;
@@ -31,13 +32,13 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
 
     // 2. Fallback to URI query parameter if not available via router
     if (_loginId == null || _loginId!.isEmpty) {
-    final uri = Uri.base;
-    _loginId = uri.queryParameters['loginId'];
-  }
+      final uri = Uri.base;
+      _loginId = uri.queryParameters['loginId'];
+    }
 
-  // 토큰도 함께 읽어놓는다.
-  final uri = Uri.base;
-  _token = uri.queryParameters['token'];
+    // 토큰도 함께 읽어놓는다.
+    final uri = Uri.base;
+    _token = uri.queryParameters['token'];
 
     _loadPolicy();
   }
@@ -66,11 +67,11 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
 
   Future<void> _handlePasswordReset() async {
     if (_formKey.currentState?.validate() != true) return;
-    if ((_loginId == null || _loginId!.isEmpty) && (_token == null || _token!.isEmpty)) {
+    if ((_loginId == null || _loginId!.isEmpty) &&
+        (_token == null || _token!.isEmpty)) {
       _showError(
         tr(
           'msg.userfront.reset.invalid_link',
-          fallback: '유효하지 않은 재설정 링크입니다. (loginId/token 누락)',
         ),
       );
       return;
@@ -91,7 +92,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
             content: Text(
               tr(
                 'msg.userfront.reset.success',
-                fallback: '비밀번호가 성공적으로 변경되었습니다. 다시 로그인해주세요.',
               ),
             ),
             backgroundColor: Colors.green,
@@ -104,7 +104,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
         _showError(
           tr(
             'msg.userfront.reset.error.generic',
-            fallback: '비밀번호 변경에 실패했습니다: {{error}}',
             params: {'error': e.toString()},
           ),
         );
@@ -126,7 +125,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
     if (_isPolicyLoading) {
       return tr(
         'msg.userfront.reset.policy_loading',
-        fallback: '비밀번호 정책을 불러오는 중입니다...',
       );
     }
     final minLength = (_policy?['minLength'] as int?) ?? 12;
@@ -139,7 +137,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
     final parts = <String>[
       tr(
         'msg.userfront.reset.policy.min_length',
-        fallback: '최소 {{count}}자 이상',
         params: {'count': '$minLength'},
       ),
     ];
@@ -147,29 +144,26 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
       parts.add(
         tr(
           'msg.userfront.reset.policy.min_types',
-          fallback: '영문 대/소문자/숫자/특수문자 중 {{count}}가지 이상',
           params: {'count': '$minTypes'},
         ),
       );
     }
     if (requiresLower) {
       parts.add(
-        tr('msg.userfront.reset.policy.lowercase', fallback: '소문자 1개 이상'),
+        tr('msg.userfront.reset.policy.lowercase'),
       );
     }
     if (requiresUpper) {
       parts.add(
-        tr('msg.userfront.reset.policy.uppercase', fallback: '대문자 1개 이상'),
+        tr('msg.userfront.reset.policy.uppercase'),
       );
     }
     if (requiresNumber) {
-      parts.add(
-        tr('msg.userfront.reset.policy.number', fallback: '숫자 1개 이상'),
-      );
+      parts.add(tr('msg.userfront.reset.policy.number'));
     }
     if (requiresSymbol) {
       parts.add(
-        tr('msg.userfront.reset.policy.symbol', fallback: '특수문자 1개 이상'),
+        tr('msg.userfront.reset.policy.symbol'),
       );
     }
 
@@ -180,16 +174,16 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(
-          tr('ui.userfront.reset.title', fallback: '새 비밀번호 설정'),
-        ),
+        title: Text(tr('ui.userfront.reset.title')),
         centerTitle: true,
       ),
       body: Center(
         child: Container(
           constraints: const BoxConstraints(maxWidth: 400),
           padding: const EdgeInsets.all(24),
-          child: (_loginId == null || _loginId!.isEmpty) && (_token == null || _token!.isEmpty)
+          child:
+              (_loginId == null || _loginId!.isEmpty) &&
+                  (_token == null || _token!.isEmpty)
               ? _buildInvalidTokenView()
               : Form(
                   key: _formKey,
@@ -200,7 +194,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                       Text(
                         tr(
                           'ui.userfront.reset.subtitle',
-                          fallback: '새로운 비밀번호 설정',
                         ),
                         style: TextStyle(
                           fontSize: 28,
@@ -221,13 +214,14 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                         decoration: InputDecoration(
                           labelText: tr(
                             'ui.userfront.reset.new_password',
-                            fallback: '새 비밀번호',
                           ),
                           border: const OutlineInputBorder(),
                           prefixIcon: const Icon(Icons.lock_outline),
                           suffixIcon: IconButton(
                             icon: Icon(
-                              _isPasswordObscured ? Icons.visibility_off : Icons.visibility,
+                              _isPasswordObscured
+                                  ? Icons.visibility_off
+                                  : Icons.visibility,
                             ),
                             onPressed: () {
                               setState(() {
@@ -241,14 +235,13 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                           if (val.isEmpty) {
                             return tr(
                               'msg.userfront.reset.error.empty_password',
-                              fallback: '비밀번호를 입력해주세요.',
                             );
                           }
-                          final minLength = (_policy?['minLength'] as int?) ?? 12;
+                          final minLength =
+                              (_policy?['minLength'] as int?) ?? 12;
                           if (val.length < minLength) {
                             return tr(
                               'msg.userfront.reset.error.min_length',
-                              fallback: '비밀번호는 최소 {{count}}자 이상이어야 합니다.',
                               params: {'count': '$minLength'},
                             );
                           }
@@ -262,12 +255,11 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                           if (hasNumber) typeCount++;
                           if (hasSymbol) typeCount++;
 
-                          final minTypes = (_policy?['minCharacterTypes'] as int?) ?? 0;
+                          final minTypes =
+                              (_policy?['minCharacterTypes'] as int?) ?? 0;
                           if (minTypes > 0 && typeCount < minTypes) {
                             return tr(
                               'msg.userfront.reset.error.min_types',
-                              fallback:
-                                  '비밀번호는 영문 대/소문자/숫자/특수문자 중 {{count}}가지 이상 포함해야 합니다.',
                               params: {'count': '$minTypes'},
                             );
                           }
@@ -275,25 +267,22 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                           if ((_policy?['lowercase'] ?? true) && !hasLower) {
                             return tr(
                               'msg.userfront.reset.error.lowercase',
-                              fallback: '최소 1개 이상의 소문자를 포함해야 합니다.',
                             );
                           }
                           if ((_policy?['uppercase'] ?? false) && !hasUpper) {
                             return tr(
                               'msg.userfront.reset.error.uppercase',
-                              fallback: '최소 1개 이상의 대문자를 포함해야 합니다.',
                             );
                           }
                           if ((_policy?['number'] ?? true) && !hasNumber) {
                             return tr(
                               'msg.userfront.reset.error.number',
-                              fallback: '최소 1개 이상의 숫자를 포함해야 합니다.',
                             );
                           }
-                          if ((_policy?['nonAlphanumeric'] ?? true) && !hasSymbol) {
+                          if ((_policy?['nonAlphanumeric'] ?? true) &&
+                              !hasSymbol) {
                             return tr(
                               'msg.userfront.reset.error.symbol',
-                              fallback: '최소 1개 이상의 특수문자를 포함해야 합니다.',
                             );
                           }
                           return null;
@@ -306,17 +295,19 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                         decoration: InputDecoration(
                           labelText: tr(
                             'ui.userfront.reset.confirm_password',
-                            fallback: '새 비밀번호 확인',
                           ),
                           border: const OutlineInputBorder(),
                           prefixIcon: const Icon(Icons.lock_outline),
                           suffixIcon: IconButton(
                             icon: Icon(
-                              _isConfirmPasswordObscured ? Icons.visibility_off : Icons.visibility,
+                              _isConfirmPasswordObscured
+                                  ? Icons.visibility_off
+                                  : Icons.visibility,
                             ),
                             onPressed: () {
                               setState(() {
-                                _isConfirmPasswordObscured = !_isConfirmPasswordObscured;
+                                _isConfirmPasswordObscured =
+                                    !_isConfirmPasswordObscured;
                               });
                             },
                           ),
@@ -325,7 +316,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                           if (value != _passwordController.text) {
                             return tr(
                               'msg.userfront.reset.error.mismatch',
-                              fallback: '비밀번호가 일치하지 않습니다.',
                             );
                           }
                           return null;
@@ -349,7 +339,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
                             : Text(
                                 tr(
                                   'ui.userfront.reset.submit',
-                                  fallback: '비밀번호 변경',
                                 ),
                               ),
                       ),
@@ -369,8 +358,7 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
           const Icon(Icons.error_outline, color: Colors.red, size: 60),
           const SizedBox(height: 16),
           Text(
-            tr('msg.userfront.reset.invalid_title',
-                fallback: '유효하지 않은 링크입니다.'),
+            tr('msg.userfront.reset.invalid_title'),
             style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             textAlign: TextAlign.center,
           ),
@@ -378,7 +366,6 @@ class _ResetPasswordScreenState extends State<ResetPasswordScreen> {
           Text(
             tr(
               'msg.userfront.reset.invalid_body',
-              fallback: '비밀번호 재설정 링크가 만료되었거나 잘못되었습니다. 다시 시도해주세요.',
             ),
             textAlign: TextAlign.center,
           ),
diff --git a/userfront/lib/features/auth/presentation/signup_screen.dart b/userfront/lib/features/auth/presentation/signup_screen.dart
index 5b5c85c7..6844ef01 100644
--- a/userfront/lib/features/auth/presentation/signup_screen.dart
+++ b/userfront/lib/features/auth/presentation/signup_screen.dart
@@ -164,30 +164,36 @@ class _SignupScreenState extends State<SignupScreen> {
     final email = _emailController.text.trim();
     final emailRegex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
     if (!emailRegex.hasMatch(email)) {
-      setState(() => _emailError = tr(
-            'msg.userfront.signup.email.invalid',
-            fallback: '유효한 이메일 형식이 아닙니다.',
-          ));
+      setState(
+        () => _emailError = tr(
+          'msg.userfront.signup.email.invalid',
+        ),
+      );
       return;
     }
-    setState(() { _isLoading = true; _emailError = null; });
+    setState(() {
+      _isLoading = true;
+      _emailError = null;
+    });
     try {
       final available = await AuthProxyService.checkEmailAvailability(email);
       if (!available) {
-        setState(() => _emailError = tr(
-              'msg.userfront.signup.email.duplicate',
-              fallback: '이미 가입된 이메일입니다.',
-            ));
+        setState(
+          () => _emailError = tr(
+            'msg.userfront.signup.email.duplicate',
+          ),
+        );
         return;
       }
       await AuthProxyService.sendSignupCode(email, 'email');
       _startTimer('email');
     } catch (e) {
-      setState(() => _emailError = tr(
-            'msg.userfront.signup.email.send_failed',
-            fallback: '발송 실패: {{error}}',
-            params: {'error': e.toString()},
-          ));
+      setState(
+        () => _emailError = tr(
+          'msg.userfront.signup.email.send_failed',
+          params: {'error': e.toString()},
+        ),
+      );
     } finally {
       setState(() => _isLoading = false);
     }
@@ -197,7 +203,11 @@ class _SignupScreenState extends State<SignupScreen> {
     final code = _emailCodeController.text.trim();
     if (code.length != 6) return;
     try {
-      final success = await AuthProxyService.verifySignupCode(_emailController.text.trim(), 'email', code);
+      final success = await AuthProxyService.verifySignupCode(
+        _emailController.text.trim(),
+        'email',
+        code,
+      );
       if (success) {
         setState(() {
           _isEmailVerified = true;
@@ -206,33 +216,39 @@ class _SignupScreenState extends State<SignupScreen> {
           _emailError = null;
         });
       } else {
-        setState(() => _emailError = tr(
-              'msg.userfront.signup.email.code_mismatch',
-              fallback: '인증코드가 일치하지 않습니다.',
-            ));
+        setState(
+          () => _emailError = tr(
+            'msg.userfront.signup.email.code_mismatch',
+          ),
+        );
       }
     } catch (e) {
-      setState(() => _emailError = tr(
-            'msg.userfront.signup.email.verify_failed',
-            fallback: '인증 실패: {{error}}',
-            params: {'error': e.toString()},
-          ));
+      setState(
+        () => _emailError = tr(
+          'msg.userfront.signup.email.verify_failed',
+          params: {'error': e.toString()},
+        ),
+      );
     }
   }
 
   Future<void> _sendPhoneCode() async {
     final phone = _phoneController.text.trim();
     if (phone.isEmpty) return;
-    setState(() { _isLoading = true; _phoneError = null; });
+    setState(() {
+      _isLoading = true;
+      _phoneError = null;
+    });
     try {
       await AuthProxyService.sendSignupCode(phone, 'phone');
       _startTimer('phone');
     } catch (e) {
-      setState(() => _phoneError = tr(
-            'msg.userfront.signup.phone.send_failed',
-            fallback: '발송 실패: {{error}}',
-            params: {'error': e.toString()},
-          ));
+      setState(
+        () => _phoneError = tr(
+          'msg.userfront.signup.phone.send_failed',
+          params: {'error': e.toString()},
+        ),
+      );
     } finally {
       setState(() => _isLoading = false);
     }
@@ -242,7 +258,11 @@ class _SignupScreenState extends State<SignupScreen> {
     final code = _phoneCodeController.text.trim();
     if (code.length != 6) return;
     try {
-      final success = await AuthProxyService.verifySignupCode(_phoneController.text.trim(), 'phone', code);
+      final success = await AuthProxyService.verifySignupCode(
+        _phoneController.text.trim(),
+        'phone',
+        code,
+      );
       if (success) {
         setState(() {
           _isPhoneVerified = true;
@@ -251,26 +271,29 @@ class _SignupScreenState extends State<SignupScreen> {
           _phoneError = null;
         });
       } else {
-        setState(() => _phoneError = tr(
-              'msg.userfront.signup.phone.code_mismatch',
-              fallback: '인증코드가 일치하지 않습니다.',
-            ));
+        setState(
+          () => _phoneError = tr(
+            'msg.userfront.signup.phone.code_mismatch',
+          ),
+        );
       }
     } catch (e) {
-      setState(() => _phoneError = tr(
-            'msg.userfront.signup.phone.verify_failed',
-            fallback: '인증 실패: {{error}}',
-            params: {'error': e.toString()},
-          ));
+      setState(
+        () => _phoneError = tr(
+          'msg.userfront.signup.phone.verify_failed',
+          params: {'error': e.toString()},
+        ),
+      );
     }
   }
 
   Future<void> _handleSignup() async {
     if (_passwordController.text != _confirmPasswordController.text) {
-      setState(() => _confirmPasswordError = tr(
-            'msg.userfront.signup.password.mismatch',
-            fallback: '비밀번호가 일치하지 않습니다.',
-          ));
+      setState(
+        () => _confirmPasswordError = tr(
+          'msg.userfront.signup.password.mismatch',
+        ),
+      );
       return;
     }
     if (!_formKey.currentState!.validate()) return;
@@ -288,7 +311,9 @@ class _SignupScreenState extends State<SignupScreen> {
         phone: _phoneController.text.trim(),
         affiliationType: _affiliationType,
         companyCode: _affiliationType == 'AFFILIATE' ? _companyCode : null,
-        department: _deptController.text.trim().isEmpty ? (_affiliationType == 'GENERAL' ? 'External' : '') : _deptController.text.trim(),
+        department: _deptController.text.trim().isEmpty
+            ? (_affiliationType == 'GENERAL' ? 'External' : '')
+            : _deptController.text.trim(),
         termsAccepted: true,
       );
       if (mounted) _showSuccessDialog();
@@ -298,32 +323,26 @@ class _SignupScreenState extends State<SignupScreen> {
         if (eStr.contains('uppercase')) {
           _passwordError = tr(
             'msg.userfront.signup.password.uppercase_required',
-            fallback: '대문자가 최소 1개 이상 포함되어야 합니다.',
           );
         } else if (eStr.contains('lowercase')) {
           _passwordError = tr(
             'msg.userfront.signup.password.lowercase_required',
-            fallback: '소문자가 최소 1개 이상 포함되어야 합니다.',
           );
         } else if (eStr.contains('digit') || eStr.contains('number')) {
           _passwordError = tr(
             'msg.userfront.signup.password.number_required',
-            fallback: '숫자가 최소 1개 이상 포함되어야 합니다.',
           );
         } else if (eStr.contains('symbol') || eStr.contains('special')) {
           _passwordError = tr(
             'msg.userfront.signup.password.symbol_required',
-            fallback: '특수문자가 최소 1개 이상 포함되어야 합니다.',
           );
         } else if (eStr.contains('length') || eStr.contains('12 characters')) {
           _passwordError = tr(
             'msg.userfront.signup.password.length_required',
-            fallback: '비밀번호는 최소 12자 이상이어야 합니다.',
           );
         } else {
           _passwordError = tr(
             'msg.userfront.signup.failed',
-            fallback: '가입 실패: {{error}}',
             params: {'error': e.toString()},
           );
         }
@@ -339,16 +358,16 @@ class _SignupScreenState extends State<SignupScreen> {
       barrierDismissible: false,
       builder: (context) => AlertDialog(
         title: Text(
-          tr('msg.userfront.signup.success.title', fallback: '회원가입 완료'),
+          tr('msg.userfront.signup.success.title'),
         ),
         content: Text(
-          tr('msg.userfront.signup.success.body', fallback: '성공적으로 가입되었습니다.'),
+          tr('msg.userfront.signup.success.body'),
         ),
         actions: [
           TextButton(
             onPressed: () => context.go('/signin'),
             child: Text(
-              tr('ui.userfront.signup.success.action', fallback: '로그인하기'),
+              tr('ui.userfront.signup.success.action'),
             ),
           ),
         ],
@@ -365,22 +384,22 @@ class _SignupScreenState extends State<SignupScreen> {
         children: [
           _stepCircle(
             1,
-            tr('ui.userfront.signup.steps.agreement', fallback: '약관동의'),
+            tr('ui.userfront.signup.steps.agreement'),
           ),
           _stepLine(1),
           _stepCircle(
             2,
-            tr('ui.userfront.signup.steps.verify', fallback: '본인인증'),
+            tr('ui.userfront.signup.steps.verify'),
           ),
           _stepLine(2),
           _stepCircle(
             3,
-            tr('ui.userfront.signup.steps.profile', fallback: '정보입력'),
+            tr('ui.userfront.signup.steps.profile'),
           ),
           _stepLine(3),
           _stepCircle(
             4,
-            tr('ui.userfront.signup.steps.password', fallback: '비밀번호'),
+            tr('ui.userfront.signup.steps.password'),
           ),
         ],
       ),
@@ -394,11 +413,28 @@ class _SignupScreenState extends State<SignupScreen> {
       children: [
         CircleAvatar(
           radius: 12,
-          backgroundColor: isDone ? Colors.green : (isCurrent ? Colors.black : Colors.grey[300]),
-          child: isDone ? const Icon(Icons.check, size: 14, color: Colors.white) : Text('$step', style: TextStyle(color: isCurrent ? Colors.white : Colors.black54, fontSize: 10)),
+          backgroundColor: isDone
+              ? Colors.green
+              : (isCurrent ? Colors.black : Colors.grey[300]),
+          child: isDone
+              ? const Icon(Icons.check, size: 14, color: Colors.white)
+              : Text(
+                  '$step',
+                  style: TextStyle(
+                    color: isCurrent ? Colors.white : Colors.black54,
+                    fontSize: 10,
+                  ),
+                ),
         ),
         const SizedBox(height: 4),
-        Text(label, style: TextStyle(fontSize: 9, color: isCurrent ? Colors.black : Colors.grey, fontWeight: isCurrent ? FontWeight.bold : FontWeight.normal)),
+        Text(
+          label,
+          style: TextStyle(
+            fontSize: 9,
+            color: isCurrent ? Colors.black : Colors.grey,
+            fontWeight: isCurrent ? FontWeight.bold : FontWeight.normal,
+          ),
+        ),
       ],
     );
   }
@@ -420,7 +456,6 @@ class _SignupScreenState extends State<SignupScreen> {
         Text(
           tr(
             'msg.userfront.signup.agreement.title',
-            fallback: '서비스 이용을 위해\n약관에 동의해주세요',
           ),
           style: const TextStyle(
             fontSize: 20,
@@ -438,10 +473,7 @@ class _SignupScreenState extends State<SignupScreen> {
           ),
           child: CheckboxListTile(
             title: Text(
-              tr(
-                'ui.userfront.signup.agreement.all',
-                fallback: '모두 동의합니다',
-              ),
+              tr('ui.userfront.signup.agreement.all'),
               style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
             ),
             value: _termsAccepted && _privacyAccepted,
@@ -459,7 +491,6 @@ class _SignupScreenState extends State<SignupScreen> {
         _agreementSection(
           title: tr(
             'ui.userfront.signup.agreement.tos_title',
-            fallback: '바론 소프트웨어 이용약관 (필수)',
           ),
           content: _tosText,
           value: _termsAccepted,
@@ -469,7 +500,6 @@ class _SignupScreenState extends State<SignupScreen> {
         _agreementSection(
           title: tr(
             'ui.userfront.signup.agreement.privacy_title',
-            fallback: '개인정보 수집 및 이용 동의 (필수)',
           ),
           content: _privacyText,
           value: _privacyAccepted,
@@ -488,8 +518,10 @@ class _SignupScreenState extends State<SignupScreen> {
     return Column(
       children: [
         CheckboxListTile(
-          title: Text(title,
-              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600)),
+          title: Text(
+            title,
+            style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
+          ),
           value: value,
           onChanged: onChanged,
           controlAffinity: ListTileControlAffinity.leading,
@@ -508,7 +540,11 @@ class _SignupScreenState extends State<SignupScreen> {
           child: SingleChildScrollView(
             child: Text(
               content,
-              style: const TextStyle(fontSize: 12, color: Colors.grey, height: 1.5),
+              style: const TextStyle(
+                fontSize: 12,
+                color: Colors.grey,
+                height: 1.5,
+              ),
             ),
           ),
         ),
@@ -517,8 +553,8 @@ class _SignupScreenState extends State<SignupScreen> {
   }
 
   static String get _tosText => tr(
-        'msg.userfront.signup.tos_full',
-        fallback: """
+    'msg.userfront.signup.tos_full',
+    fallback: """
 바론 소프트웨어 이용약관
 
 제1장 총칙
@@ -589,11 +625,11 @@ class _SignupScreenState extends State<SignupScreen> {
 부칙
 본 약관은 2024년 10월 1일부터 시행됩니다.
 """,
-      );
+  );
 
   static String get _privacyText => tr(
-        'msg.userfront.signup.privacy_full',
-        fallback: """
+    'msg.userfront.signup.privacy_full',
+    fallback: """
 개인정보 수집 및 이용 동의
 
 바론서비스 개인정보처리방침
@@ -702,7 +738,7 @@ class _SignupScreenState extends State<SignupScreen> {
 제8조 (기타)
 본 방침에 명시되지 않은 사항은 회사의 내부 방침과 관련 법령에 따릅니다.
 """,
-      );
+  );
 
   Widget _buildStepAuth() {
     return Column(
@@ -711,7 +747,6 @@ class _SignupScreenState extends State<SignupScreen> {
         Text(
           tr(
             'msg.userfront.signup.auth.title',
-            fallback: '본인 확인을 위해\n인증을 진행해주세요',
           ),
           style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
         ),
@@ -719,7 +754,10 @@ class _SignupScreenState extends State<SignupScreen> {
         // 가족사 이메일 안내 문구
         Container(
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-          decoration: BoxDecoration(color: Colors.blue[50], borderRadius: BorderRadius.circular(6)),
+          decoration: BoxDecoration(
+            color: Colors.blue[50],
+            borderRadius: BorderRadius.circular(6),
+          ),
           child: Row(
             children: [
               const Icon(Icons.info_outline, size: 16, color: Colors.blue),
@@ -728,9 +766,12 @@ class _SignupScreenState extends State<SignupScreen> {
                 child: Text(
                   tr(
                     'msg.userfront.signup.auth.affiliate_notice',
-                    fallback: '가족사 회원의 경우 반드시 회사 공식 이메일을 입력해주세요.',
                   ),
-                  style: const TextStyle(fontSize: 12, color: Colors.blue, fontWeight: FontWeight.w500),
+                  style: const TextStyle(
+                    fontSize: 12,
+                    color: Colors.blue,
+                    fontWeight: FontWeight.w500,
+                  ),
                 ),
               ),
             ],
@@ -738,7 +779,7 @@ class _SignupScreenState extends State<SignupScreen> {
         ),
         const SizedBox(height: 24),
         Text(
-          tr('ui.userfront.signup.auth.email.title', fallback: '이메일 인증'),
+          tr('ui.userfront.signup.auth.email.title'),
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         const SizedBox(height: 8),
@@ -751,9 +792,8 @@ class _SignupScreenState extends State<SignupScreen> {
                 decoration: InputDecoration(
                   labelText: tr(
                     'ui.userfront.signup.auth.email.label',
-                    fallback: '이메일 주소',
                   ),
-                  border: const OutlineInputBorder(), 
+                  border: const OutlineInputBorder(),
                   errorText: _emailError,
                   hintText: 'example@hanmaceng.co.kr',
                 ),
@@ -764,14 +804,19 @@ class _SignupScreenState extends State<SignupScreen> {
             SizedBox(
               height: 55,
               child: ElevatedButton(
-                onPressed: (_isEmailVerified || _isLoading) ? null : _sendEmailCode,
-                style: ElevatedButton.styleFrom(backgroundColor: Colors.grey[100], foregroundColor: Colors.black, elevation: 0),
+                onPressed: (_isEmailVerified || _isLoading)
+                    ? null
+                    : _sendEmailCode,
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.grey[100],
+                  foregroundColor: Colors.black,
+                  elevation: 0,
+                ),
                 child: Text(
                   _emailSeconds > 0
-                      ? tr('ui.common.resend', fallback: '재발송')
+                      ? tr('ui.common.resend')
                       : tr(
                           'ui.userfront.signup.auth.request_code',
-                          fallback: '인증요청',
                         ),
                 ),
               ),
@@ -785,14 +830,18 @@ class _SignupScreenState extends State<SignupScreen> {
             decoration: InputDecoration(
               labelText: tr(
                 'ui.userfront.signup.auth.code_label',
-                fallback: '인증코드 6자리',
               ),
               suffixText: _formatTime(_emailSeconds),
               border: const OutlineInputBorder(),
             ),
             keyboardType: TextInputType.number,
-            inputFormatters: [FilteringTextInputFormatter.digitsOnly, LengthLimitingTextInputFormatter(6)],
-            onChanged: (val) { if(val.length == 6) _verifyEmailCode(); },
+            inputFormatters: [
+              FilteringTextInputFormatter.digitsOnly,
+              LengthLimitingTextInputFormatter(6),
+            ],
+            onChanged: (val) {
+              if (val.length == 6) _verifyEmailCode();
+            },
           ),
         ],
         if (_isEmailVerified)
@@ -801,7 +850,6 @@ class _SignupScreenState extends State<SignupScreen> {
             child: Text(
               tr(
                 'msg.userfront.signup.email.verified',
-                fallback: '✅ 이메일 인증 완료',
               ),
               style: const TextStyle(
                 color: Colors.green,
@@ -812,7 +860,7 @@ class _SignupScreenState extends State<SignupScreen> {
           ),
         const SizedBox(height: 24),
         Text(
-          tr('ui.userfront.signup.phone.title', fallback: '휴대폰 인증'),
+          tr('ui.userfront.signup.phone.title'),
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         const SizedBox(height: 8),
@@ -824,7 +872,6 @@ class _SignupScreenState extends State<SignupScreen> {
                 decoration: InputDecoration(
                   labelText: tr(
                     'ui.userfront.signup.phone.label',
-                    fallback: '휴대폰 번호 (-없이)',
                   ),
                   border: const OutlineInputBorder(),
                   errorText: _phoneError,
@@ -837,14 +884,19 @@ class _SignupScreenState extends State<SignupScreen> {
             SizedBox(
               height: 55,
               child: ElevatedButton(
-                onPressed: (_isPhoneVerified || _isLoading) ? null : _sendPhoneCode,
-                style: ElevatedButton.styleFrom(backgroundColor: Colors.grey[100], foregroundColor: Colors.black, elevation: 0),
+                onPressed: (_isPhoneVerified || _isLoading)
+                    ? null
+                    : _sendPhoneCode,
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.grey[100],
+                  foregroundColor: Colors.black,
+                  elevation: 0,
+                ),
                 child: Text(
                   _phoneSeconds > 0
-                      ? tr('ui.common.resend', fallback: '재발송')
+                      ? tr('ui.common.resend')
                       : tr(
                           'ui.userfront.signup.auth.request_code',
-                          fallback: '인증요청',
                         ),
                 ),
               ),
@@ -858,14 +910,18 @@ class _SignupScreenState extends State<SignupScreen> {
             decoration: InputDecoration(
               labelText: tr(
                 'ui.userfront.signup.auth.code_label',
-                fallback: '인증코드 6자리',
               ),
               suffixText: _formatTime(_phoneSeconds),
               border: const OutlineInputBorder(),
             ),
             keyboardType: TextInputType.number,
-            inputFormatters: [FilteringTextInputFormatter.digitsOnly, LengthLimitingTextInputFormatter(6)],
-            onChanged: (val) { if(val.length == 6) _verifyPhoneCode(); },
+            inputFormatters: [
+              FilteringTextInputFormatter.digitsOnly,
+              LengthLimitingTextInputFormatter(6),
+            ],
+            onChanged: (val) {
+              if (val.length == 6) _verifyPhoneCode();
+            },
           ),
         ],
         if (_isPhoneVerified)
@@ -874,7 +930,6 @@ class _SignupScreenState extends State<SignupScreen> {
             child: Text(
               tr(
                 'msg.userfront.signup.phone.verified',
-                fallback: '✅ 휴대폰 인증 완료',
               ),
               style: const TextStyle(
                 color: Colors.green,
@@ -894,7 +949,6 @@ class _SignupScreenState extends State<SignupScreen> {
         Text(
           tr(
             'msg.userfront.signup.profile.title',
-            fallback: '회원님의\n소속 정보를 알려주세요',
           ),
           style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
         ),
@@ -903,10 +957,7 @@ class _SignupScreenState extends State<SignupScreen> {
           controller: _nameController,
           onChanged: (_) => setState(() {}),
           decoration: InputDecoration(
-            labelText: tr(
-              'ui.userfront.signup.profile.name',
-              fallback: '이름',
-            ),
+            labelText: tr('ui.userfront.signup.profile.name'),
             border: const OutlineInputBorder(),
           ),
         ),
@@ -922,13 +973,11 @@ class _SignupScreenState extends State<SignupScreen> {
               decoration: InputDecoration(
                 labelText: tr(
                   'ui.userfront.signup.profile.affiliation_type',
-                  fallback: '소속 유형',
                 ),
                 border: const OutlineInputBorder(),
                 helperText: _isAffiliateEmail
                     ? tr(
                         'msg.userfront.signup.profile.affiliate_hint',
-                        fallback: '가족사 이메일 사용 시 자동으로 선택됩니다.',
                       )
                     : null,
               ),
@@ -936,19 +985,13 @@ class _SignupScreenState extends State<SignupScreen> {
                 DropdownMenuItem(
                   value: 'GENERAL',
                   child: Text(
-                    tr(
-                      'domain.affiliation.general',
-                      fallback: '일반 사용자',
-                    ),
+                    tr('domain.affiliation.general'),
                   ),
                 ),
                 DropdownMenuItem(
                   value: 'AFFILIATE',
                   child: Text(
-                    tr(
-                      'domain.affiliation.affiliate',
-                      fallback: '가족사 임직원',
-                    ),
+                    tr('domain.affiliation.affiliate'),
                   ),
                 ),
               ],
@@ -978,46 +1021,33 @@ class _SignupScreenState extends State<SignupScreen> {
                 decoration: InputDecoration(
                   labelText: tr(
                     'ui.userfront.signup.profile.company',
-                    fallback: '가족사 선택',
                   ),
                   border: const OutlineInputBorder(),
                 ),
                 items: [
                   DropdownMenuItem(
                     value: 'HANMAC',
-                    child: Text(
-                      tr('domain.company.hanmac', fallback: '한맥'),
-                    ),
+                    child: Text(tr('domain.company.hanmac')),
                   ),
                   DropdownMenuItem(
                     value: 'SAMAN',
-                    child: Text(
-                      tr('domain.company.saman', fallback: '삼안'),
-                    ),
+                    child: Text(tr('domain.company.saman')),
                   ),
                   DropdownMenuItem(
                     value: 'PTC',
-                    child: Text(
-                      tr('domain.company.ptc', fallback: 'PTC'),
-                    ),
+                    child: Text(tr('domain.company.ptc', fallback: 'PTC')),
                   ),
                   DropdownMenuItem(
                     value: 'JANGHEON',
-                    child: Text(
-                      tr('domain.company.jangheon', fallback: '장헌'),
-                    ),
+                    child: Text(tr('domain.company.jangheon')),
                   ),
                   DropdownMenuItem(
                     value: 'BARON',
-                    child: Text(
-                      tr('domain.company.baron', fallback: '바론'),
-                    ),
+                    child: Text(tr('domain.company.baron')),
                   ),
                   DropdownMenuItem(
                     value: 'HALLA',
-                    child: Text(
-                      tr('domain.company.halla', fallback: '한라'),
-                    ),
+                    child: Text(tr('domain.company.halla')),
                   ),
                 ],
                 onChanged: _isAffiliateEmail
@@ -1033,12 +1063,11 @@ class _SignupScreenState extends State<SignupScreen> {
           onChanged: (_) => setState(() {}),
           decoration: InputDecoration(
             labelText: _affiliationType == 'AFFILIATE'
-                ? tr('ui.userfront.signup.profile.department', fallback: '부서명')
+                ? tr('ui.userfront.signup.profile.department')
                 : tr(
                     'ui.userfront.signup.profile.department_optional',
-                    fallback: '소속 정보 (선택)',
                   ),
-            border: const OutlineInputBorder()
+            border: const OutlineInputBorder(),
           ),
         ),
       ],
@@ -1049,7 +1078,6 @@ class _SignupScreenState extends State<SignupScreen> {
     if (_isPolicyLoading) {
       return tr(
         'msg.userfront.signup.policy.loading',
-        fallback: '비밀번호 정책을 불러오는 중입니다...',
       );
     }
     final minLength = (_policy?['minLength'] as int?) ?? 12;
@@ -1062,7 +1090,6 @@ class _SignupScreenState extends State<SignupScreen> {
     final parts = <String>[
       tr(
         'msg.userfront.signup.policy.min_length',
-        fallback: '최소 {{count}}자 이상',
         params: {'count': minLength.toString()},
       ),
     ];
@@ -1070,54 +1097,32 @@ class _SignupScreenState extends State<SignupScreen> {
       parts.add(
         tr(
           'msg.userfront.signup.policy.min_types',
-          fallback: '영문 대/소문자/숫자/특수문자 중 {{count}}가지 이상',
           params: {'count': minTypes.toString()},
         ),
       );
     }
     if (requiresUpper) {
-      parts.add(
-        tr(
-          'msg.userfront.signup.policy.uppercase',
-          fallback: '대문자',
-        ),
-      );
+      parts.add(tr('msg.userfront.signup.policy.uppercase'));
     }
     if (requiresLower) {
-      parts.add(
-        tr(
-          'msg.userfront.signup.policy.lowercase',
-          fallback: '소문자',
-        ),
-      );
+      parts.add(tr('msg.userfront.signup.policy.lowercase'));
     }
     if (requiresNumber) {
-      parts.add(
-        tr(
-          'msg.userfront.signup.policy.number',
-          fallback: '숫자',
-        ),
-      );
+      parts.add(tr('msg.userfront.signup.policy.number'));
     }
     if (requiresSymbol) {
-      parts.add(
-        tr(
-          'msg.userfront.signup.policy.symbol',
-          fallback: '특수문자',
-        ),
-      );
+      parts.add(tr('msg.userfront.signup.policy.symbol'));
     }
 
     return tr(
       'msg.userfront.signup.policy.summary',
-      fallback: '보안 정책: {{rules}}',
       params: {'rules': parts.join(', ')},
     );
   }
 
   Widget _buildStepPassword() {
     String p = _passwordController.text;
-    
+
     // Default Policy Fallback
     final minLength = (_policy?['minLength'] as int?) ?? 12;
     final minTypes = (_policy?['minCharacterTypes'] as int?) ?? 0;
@@ -1144,7 +1149,6 @@ class _SignupScreenState extends State<SignupScreen> {
         Text(
           tr(
             'msg.userfront.signup.password.title',
-            fallback: '마지막으로\n비밀번호를 설정해주세요',
           ),
           style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
         ),
@@ -1152,7 +1156,10 @@ class _SignupScreenState extends State<SignupScreen> {
         // 비밀번호 정책 안내 박스
         Container(
           padding: const EdgeInsets.all(12),
-          decoration: BoxDecoration(color: Colors.blue[50], borderRadius: BorderRadius.circular(8)),
+          decoration: BoxDecoration(
+            color: Colors.blue[50],
+            borderRadius: BorderRadius.circular(8),
+          ),
           child: Row(
             children: [
               const Icon(Icons.security, size: 18, color: Colors.blue),
@@ -1160,7 +1167,11 @@ class _SignupScreenState extends State<SignupScreen> {
               Expanded(
                 child: Text(
                   _buildPolicyDescription(),
-                  style: TextStyle(fontSize: 12, color: Colors.blue[800], fontWeight: FontWeight.w500),
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: Colors.blue[800],
+                    fontWeight: FontWeight.w500,
+                  ),
                 ),
               ),
             ],
@@ -1174,7 +1185,6 @@ class _SignupScreenState extends State<SignupScreen> {
           decoration: InputDecoration(
             labelText: tr(
               'ui.userfront.signup.password.label',
-              fallback: '비밀번호',
             ),
             border: const OutlineInputBorder(),
             errorText: _passwordError,
@@ -1187,7 +1197,6 @@ class _SignupScreenState extends State<SignupScreen> {
             _cryptoCheck(
               tr(
                 'msg.userfront.signup.password.rule.min_length',
-                fallback: '{{count}}자 이상',
                 params: {'count': minLength.toString()},
               ),
               hasLength,
@@ -1196,7 +1205,6 @@ class _SignupScreenState extends State<SignupScreen> {
               _cryptoCheck(
                 tr(
                   'msg.userfront.signup.password.rule.min_types',
-                  fallback: '문자 유형 {{count}}가지 이상',
                   params: {'count': minTypes.toString()},
                 ),
                 hasTypeCount,
@@ -1205,7 +1213,6 @@ class _SignupScreenState extends State<SignupScreen> {
               _cryptoCheck(
                 tr(
                   'msg.userfront.signup.password.rule.uppercase',
-                  fallback: '대문자',
                 ),
                 hasUpper,
               ),
@@ -1213,23 +1220,18 @@ class _SignupScreenState extends State<SignupScreen> {
               _cryptoCheck(
                 tr(
                   'msg.userfront.signup.password.rule.lowercase',
-                  fallback: '소문자',
                 ),
                 hasLower,
               ),
             if (requiresNumber)
               _cryptoCheck(
-                tr(
-                  'msg.userfront.signup.password.rule.number',
-                  fallback: '숫자',
-                ),
+                tr('msg.userfront.signup.password.rule.number'),
                 hasDigit,
               ),
             if (requiresSymbol)
               _cryptoCheck(
                 tr(
                   'msg.userfront.signup.password.rule.symbol',
-                  fallback: '특수문자',
                 ),
                 hasSpecial,
               ),
@@ -1244,7 +1246,6 @@ class _SignupScreenState extends State<SignupScreen> {
               _confirmPasswordError = (val != _passwordController.text)
                   ? tr(
                       'msg.userfront.signup.password.mismatch',
-                      fallback: '비밀번호가 일치하지 않습니다.',
                     )
                   : null;
             });
@@ -1252,8 +1253,7 @@ class _SignupScreenState extends State<SignupScreen> {
           decoration: InputDecoration(
             labelText: tr(
               'ui.userfront.signup.password.confirm_label',
-              fallback: '비밀번호 확인',
-            ), 
+            ),
             border: const OutlineInputBorder(),
             errorText: _confirmPasswordError,
           ),
@@ -1266,9 +1266,19 @@ class _SignupScreenState extends State<SignupScreen> {
     return Row(
       mainAxisSize: MainAxisSize.min,
       children: [
-        Icon(isValid ? Icons.check_circle : Icons.circle_outlined, size: 14, color: isValid ? Colors.green : Colors.grey),
+        Icon(
+          isValid ? Icons.check_circle : Icons.circle_outlined,
+          size: 14,
+          color: isValid ? Colors.green : Colors.grey,
+        ),
         const SizedBox(width: 4),
-        Text(label, style: TextStyle(fontSize: 11, color: isValid ? Colors.green : Colors.grey)),
+        Text(
+          label,
+          style: TextStyle(
+            fontSize: 11,
+            color: isValid ? Colors.green : Colors.grey,
+          ),
+        ),
       ],
     );
   }
@@ -1276,8 +1286,10 @@ class _SignupScreenState extends State<SignupScreen> {
   @override
   Widget build(BuildContext context) {
     bool canGoNext = false;
-    if (_currentStep == 1 && _termsAccepted && _privacyAccepted) canGoNext = true;
-    if (_currentStep == 2 && _isEmailVerified && _isPhoneVerified) canGoNext = true;
+    if (_currentStep == 1 && _termsAccepted && _privacyAccepted)
+      canGoNext = true;
+    if (_currentStep == 2 && _isEmailVerified && _isPhoneVerified)
+      canGoNext = true;
     if (_currentStep == 3) {
       final nameOk = _nameController.text.trim().isNotEmpty;
       if (_affiliationType == 'GENERAL') {
@@ -1294,7 +1306,7 @@ class _SignupScreenState extends State<SignupScreen> {
       backgroundColor: Colors.white,
       appBar: AppBar(
         title: Text(
-          tr('ui.userfront.signup.title', fallback: '회원가입'),
+          tr('ui.userfront.signup.title'),
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         elevation: 0,
@@ -1313,11 +1325,13 @@ class _SignupScreenState extends State<SignupScreen> {
                 padding: const EdgeInsets.all(24),
                 child: Form(
                   key: _formKey,
-                  child: _currentStep == 1 
-                    ? _buildStepAgreement() 
-                    : (_currentStep == 2 
-                        ? _buildStepAuth() 
-                        : (_currentStep == 3 ? _buildStepInfo() : _buildStepPassword())),
+                  child: _currentStep == 1
+                      ? _buildStepAgreement()
+                      : (_currentStep == 2
+                            ? _buildStepAuth()
+                            : (_currentStep == 3
+                                  ? _buildStepInfo()
+                                  : _buildStepPassword())),
                 ),
               ),
             ),
@@ -1329,9 +1343,12 @@ class _SignupScreenState extends State<SignupScreen> {
                     Expanded(
                       child: OutlinedButton(
                         onPressed: () => setState(() => _currentStep--),
-                        style: OutlinedButton.styleFrom(minimumSize: const Size.fromHeight(55), side: const BorderSide(color: Colors.black)),
+                        style: OutlinedButton.styleFrom(
+                          minimumSize: const Size.fromHeight(55),
+                          side: const BorderSide(color: Colors.black),
+                        ),
                         child: Text(
-                          tr('ui.common.prev', fallback: '이전'),
+                          tr('ui.common.prev'),
                           style: const TextStyle(color: Colors.black),
                         ),
                       ),
@@ -1340,20 +1357,33 @@ class _SignupScreenState extends State<SignupScreen> {
                   ],
                   Expanded(
                     child: FilledButton(
-                      onPressed: _currentStep < 4 
-                        ? (canGoNext ? () => setState(() => _currentStep++) : null)
-                        : (_isLoading ? null : _handleSignup),
+                      onPressed: _currentStep < 4
+                          ? (canGoNext
+                                ? () => setState(() => _currentStep++)
+                                : null)
+                          : (_isLoading ? null : _handleSignup),
                       style: FilledButton.styleFrom(
                         minimumSize: const Size.fromHeight(55),
                         backgroundColor: Colors.black,
                       ),
-                      child: _isLoading 
-                        ? const SizedBox(height: 20, width: 20, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2))
-                        : Text(
-                            _currentStep < 4
-                                ? tr('ui.userfront.signup.next_step', fallback: '다음 단계')
-                                : tr('ui.userfront.signup.complete', fallback: '가입 완료'),
-                          ),
+                      child: _isLoading
+                          ? const SizedBox(
+                              height: 20,
+                              width: 20,
+                              child: CircularProgressIndicator(
+                                color: Colors.white,
+                                strokeWidth: 2,
+                              ),
+                            )
+                          : Text(
+                              _currentStep < 4
+                                  ? tr(
+                                      'ui.userfront.signup.next_step',
+                                    )
+                                  : tr(
+                                      'ui.userfront.signup.complete',
+                                    ),
+                            ),
                     ),
                   ),
                 ],
diff --git a/userfront/lib/features/dashboard/domain/dashboard_providers.dart b/userfront/lib/features/dashboard/domain/dashboard_providers.dart
index 6c090a49..c28a6fa1 100644
--- a/userfront/lib/features/dashboard/domain/dashboard_providers.dart
+++ b/userfront/lib/features/dashboard/domain/dashboard_providers.dart
@@ -181,7 +181,6 @@ class AuthTimelineNotifier extends Notifier<AuthTimelineState> {
         isLoadingMore: false,
         error: tr(
           'msg.userfront.dashboard.timeline.load_error',
-          fallback: '접속이력을 불러오지 못했습니다.',
         ),
       );
     }
diff --git a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
index b7db69d3..39081868 100644
--- a/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
+++ b/userfront/lib/features/dashboard/presentation/dashboard_screen.dart
@@ -9,6 +9,8 @@ import '../domain/providers/linked_rps_provider.dart';
 import '../../../../core/notifiers/auth_notifier.dart';
 import '../../../../core/services/auth_token_store.dart';
 import '../../../../core/services/http_client.dart';
+import '../../../../core/i18n/locale_utils.dart';
+import '../../../../core/widgets/language_selector.dart';
 import '../../../../core/ui/layout_breakpoints.dart';
 import '../../profile/domain/notifiers/profile_notifier.dart';
 import '../domain/dashboard_providers.dart';
@@ -35,6 +37,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   bool _auditLoading = false;
   bool _auditLoadingMore = false;
   bool _isRevoking = false;
+  bool _redirectingToSignin = false;
 
   bool _showAllActivities = false;
   final Set<String> _revokedClientIds = {};
@@ -43,7 +46,13 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   void initState() {
     super.initState();
     _pageScrollController.addListener(_onPageScroll);
-    _loadAuditLogs(reset: true);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!_isLoggedIn()) {
+        _redirectToSignin();
+        return;
+      }
+      _loadAuditLogs(reset: true);
+    });
   }
 
   @override
@@ -63,26 +72,27 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       context: context,
       builder: (context) => AlertDialog(
         title: Text(
-          tr('ui.userfront.dashboard.revoke.title', fallback: '연동 해지'),
+          tr('ui.userfront.dashboard.revoke.title'),
         ),
         content: Text(
           tr(
             'msg.userfront.dashboard.revoke.confirm',
-            fallback:
-                '{{app}} 앱과의 연동을 해지하시겠습니까?\\n해지하면 다음 로그인 시 다시 동의가 필요합니다.',
             params: {'app': appName},
           ),
         ),
         actions: [
           TextButton(
             onPressed: () => Navigator.of(context).pop(false),
-            child: Text(tr('ui.common.cancel', fallback: '취소')),
+            child: Text(tr('ui.common.cancel')),
           ),
           TextButton(
             onPressed: () => Navigator.of(context).pop(true),
             style: TextButton.styleFrom(foregroundColor: Colors.red),
-            child:
-                Text(tr('ui.userfront.dashboard.revoke.confirm_button', fallback: '해지하기')),
+            child: Text(
+              tr(
+                'ui.userfront.dashboard.revoke.confirm_button',
+              ),
+            ),
           ),
         ],
       ),
@@ -99,7 +109,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
             content: Text(
               tr(
                 'msg.userfront.dashboard.revoke.success',
-                fallback: '{{app}} 연동이 해지되었습니다.',
                 params: {'app': appName},
               ),
             ),
@@ -117,7 +126,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
             content: Text(
               tr(
                 'msg.userfront.dashboard.revoke.error',
-                fallback: '해지 실패: {{error}}',
                 params: {'error': '$e'},
               ),
             ),
@@ -158,31 +166,42 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
-                    tr('ui.userfront.dashboard.scopes.title',
-                        fallback: '권한 (Scopes)'),
+                    tr(
+                      'ui.userfront.dashboard.scopes.title',
+                    ),
                     style: const TextStyle(fontWeight: FontWeight.bold),
                   ),
                   const SizedBox(height: 8),
                   if (item.scopes.isEmpty)
                     Text(
-                      tr('msg.userfront.dashboard.scopes.empty',
-                          fallback: '요청된 권한이 없습니다.'),
+                      tr(
+                        'msg.userfront.dashboard.scopes.empty',
+                      ),
                       style: const TextStyle(color: Colors.grey),
                     )
                   else
                     Wrap(
                       spacing: 8,
                       runSpacing: 4,
-                      children: item.scopes.map((s) => Chip(
-                        label: Text(s, style: const TextStyle(fontSize: 12)),
-                        visualDensity: VisualDensity.compact,
-                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      )).toList(),
+                      children: item.scopes
+                          .map(
+                            (s) => Chip(
+                              label: Text(
+                                s,
+                                style: const TextStyle(fontSize: 12),
+                              ),
+                              visualDensity: VisualDensity.compact,
+                              materialTapTargetSize:
+                                  MaterialTapTargetSize.shrinkWrap,
+                            ),
+                          )
+                          .toList(),
                     ),
                   const SizedBox(height: 24),
                   Text(
-                    tr('ui.userfront.dashboard.status_history',
-                        fallback: '상태 이력'),
+                    tr(
+                      'ui.userfront.dashboard.status_history',
+                    ),
                     style: const TextStyle(fontWeight: FontWeight.bold),
                   ),
                   const SizedBox(height: 8),
@@ -192,7 +211,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                       Text(
                         tr(
                           'msg.userfront.dashboard.last_auth',
-                          fallback: '최근 인증: {{value}}',
                           params: {'value': item.lastAuthAt},
                         ),
                       ),
@@ -200,14 +218,13 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                       Builder(
                         builder: (context) {
                           final statusLabel = item.status == 'active'
-                              ? tr('ui.common.status.active',
-                                  fallback: '활성')
-                              : tr('ui.userfront.dashboard.status.revoked',
-                                  fallback: '해지됨');
+                              ? tr('ui.common.status.active')
+                              : tr(
+                                  'ui.userfront.dashboard.status.revoked',
+                                );
                           return Text(
                             tr(
                               'msg.userfront.dashboard.current_status',
-                              fallback: '현재 상태: {{status}}',
                               params: {'status': statusLabel},
                             ),
                             style: TextStyle(
@@ -226,7 +243,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
             actions: [
               TextButton(
                 onPressed: () => Navigator.of(context).pop(),
-                child: Text(tr('ui.common.close', fallback: '닫기')),
+                child: Text(tr('ui.common.close')),
               ),
             ],
           );
@@ -237,54 +254,60 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
   Widget _buildSideMenu(BuildContext context, {required bool closeOnTap}) {
     return SafeArea(
-      child: ListView(
-        padding: const EdgeInsets.symmetric(vertical: 12),
+      child: Column(
         children: [
-          ListTile(
-            leading: const Icon(Icons.home_outlined),
-            title:
-                Text(tr('ui.userfront.nav.dashboard', fallback: '대시보드')),
-            selected: true,
-            onTap: () {
-              if (closeOnTap) {
-                Navigator.of(context).pop();
-              }
-              context.go('/');
-            },
+          Expanded(
+            child: ListView(
+              padding: const EdgeInsets.symmetric(vertical: 12),
+              children: [
+                ListTile(
+                  leading: const Icon(Icons.home_outlined),
+                  title: Text(tr('ui.userfront.nav.dashboard')),
+                  selected: true,
+                  onTap: () {
+                    if (closeOnTap) {
+                      Navigator.of(context).pop();
+                    }
+                    context.go('/');
+                  },
+                ),
+                ListTile(
+                  leading: const Icon(Icons.person_outline),
+                  title: Text(tr('ui.userfront.nav.profile')),
+                  onTap: () {
+                    if (closeOnTap) {
+                      Navigator.of(context).pop();
+                    }
+                    context.push('/profile');
+                  },
+                ),
+                ListTile(
+                  leading: const Icon(Icons.qr_code_scanner),
+                  title: Text(tr('ui.userfront.nav.qr_scan')),
+                  onTap: () {
+                    if (closeOnTap) {
+                      Navigator.of(context).pop();
+                    }
+                    _onScanQR();
+                  },
+                ),
+                const Divider(),
+                ListTile(
+                  leading: const Icon(Icons.logout),
+                  title: Text(tr('ui.userfront.nav.logout')),
+                  onTap: () async {
+                    if (closeOnTap) {
+                      Navigator.of(context).pop();
+                    }
+                    await _logout();
+                  },
+                ),
+              ],
+            ),
           ),
-          ListTile(
-            leading: const Icon(Icons.person_outline),
-            title:
-                Text(tr('ui.userfront.nav.profile', fallback: '내 정보')),
-            onTap: () {
-              if (closeOnTap) {
-                Navigator.of(context).pop();
-              }
-              context.push('/profile');
-            },
-          ),
-          ListTile(
-            leading: const Icon(Icons.qr_code_scanner),
-            title:
-                Text(tr('ui.userfront.nav.qr_scan', fallback: 'QR 스캔')),
-            onTap: () {
-              if (closeOnTap) {
-                Navigator.of(context).pop();
-              }
-              _onScanQR();
-            },
-          ),
-          const Divider(),
-          ListTile(
-            leading: const Icon(Icons.logout),
-            title:
-                Text(tr('ui.userfront.nav.logout', fallback: '로그아웃')),
-            onTap: () async {
-              if (closeOnTap) {
-                Navigator.of(context).pop();
-              }
-              await _logout();
-            },
+          const Padding(
+            padding: EdgeInsets.only(bottom: 16),
+            child: LanguageSelector(compact: true),
           ),
         ],
       ),
@@ -292,17 +315,21 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   }
 
   Future<void> _refreshAll() async {
+    if (!_isLoggedIn()) {
+      _redirectToSignin();
+      return;
+    }
     await ref.read(profileProvider.notifier).loadProfile();
     setState(() {
       _revokedClientIds.clear();
     });
     ref.invalidate(linkedRpsProvider);
-    
+
     await Future.wait([
       ref.read(linkedRpsProvider.future),
       ref.read(authTimelineProvider.notifier).refresh(),
     ]);
-    
+
     await _loadAuditLogs(reset: true);
     await ref.read(linkedRpsProvider.notifier).refresh();
   }
@@ -316,21 +343,18 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
   Future<AuditPage> _fetchAuditLogs({String? cursor}) async {
     final baseUrl = _envOrDefault('BACKEND_URL', 'https://sso.hmac.kr');
-    final queryParameters = <String, String>{
-      'limit': '20',
-    };
+    final queryParameters = <String, String>{'limit': '20'};
     if (cursor != null && cursor.isNotEmpty) {
       queryParameters['cursor'] = cursor;
     }
-    final url = Uri.parse('$baseUrl/api/v1/audit/auth/timeline')
-        .replace(queryParameters: queryParameters);
+    final url = Uri.parse(
+      '$baseUrl/api/v1/audit/auth/timeline',
+    ).replace(queryParameters: queryParameters);
     final useCookie = AuthTokenStore.usesCookie();
     final token = AuthTokenStore.getToken();
 
     final client = createHttpClient(withCredentials: useCookie);
-    final headers = <String, String>{
-      'Content-Type': 'application/json',
-    };
+    final headers = <String, String>{'Content-Type': 'application/json'};
     if (!useCookie && token != null) {
       headers['Authorization'] = 'Bearer $token';
     }
@@ -356,6 +380,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   }
 
   Future<void> _loadAuditLogs({bool reset = false}) async {
+    if (!_isLoggedIn()) {
+      return;
+    }
     if (_auditLoading || _auditLoadingMore) {
       return;
     }
@@ -401,11 +428,15 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       if (parts.length != 3) {
         return null;
       }
-      final payload = utf8.decode(base64Url.decode(base64Url.normalize(parts[1])));
+      final payload = utf8.decode(
+        base64Url.decode(base64Url.normalize(parts[1])),
+      );
       final data = json.decode(payload) as Map<String, dynamic>;
       final iatValue = data['iat'] ?? data['auth_time'];
       if (iatValue is num) {
-        return DateTime.fromMillisecondsSinceEpoch(iatValue.toInt() * 1000).toLocal();
+        return DateTime.fromMillisecondsSinceEpoch(
+          iatValue.toInt() * 1000,
+        ).toLocal();
       }
     } catch (_) {
       return null;
@@ -428,15 +459,15 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
   String _authMethodLabel() {
     if (AuthTokenStore.usesCookie()) {
-      return tr('ui.userfront.auth_method.ory', fallback: 'Ory 세션');
+      return tr('ui.userfront.auth_method.ory');
     }
     final provider = AuthTokenStore.getProvider();
     if (provider == null || provider.isEmpty) {
-      return tr('ui.userfront.auth_method.session', fallback: '세션');
+      return tr('ui.userfront.auth_method.session');
     }
     final lower = provider.toLowerCase();
     if (lower.contains('ory')) {
-      return tr('ui.userfront.auth_method.ory', fallback: 'Ory 세션');
+      return tr('ui.userfront.auth_method.ory');
     }
     return provider;
   }
@@ -467,9 +498,11 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   Widget _buildAuthMethodCell(AuditLogEntry log, String authMethod) {
     final isOidc = authMethod.contains('OIDC');
     if (authMethod != 'QR' && !isOidc) {
-      final approvedUserAgent = log.detailMap['approved_user_agent']?.toString() ?? '';
+      final approvedUserAgent =
+          log.detailMap['approved_user_agent']?.toString() ?? '';
       final approvedIp = log.detailMap['approved_ip']?.toString() ?? '';
-      final hasApproverMeta = approvedUserAgent.isNotEmpty || approvedIp.isNotEmpty;
+      final hasApproverMeta =
+          approvedUserAgent.isNotEmpty || approvedIp.isNotEmpty;
       if (!authMethod.startsWith('링크') || !hasApproverMeta) {
         return _selectableText(authMethod);
       }
@@ -477,12 +510,10 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       final tooltip = [
         tr(
           'msg.userfront.dashboard.approved_device',
-          fallback: '승인 기기: {{device}}',
           params: {'device': deviceLabel},
         ),
         tr(
           'msg.userfront.dashboard.approved_ip',
-          fallback: '승인 IP: {{ip}}',
           params: {'ip': approvedIp.isEmpty ? '-' : approvedIp},
         ),
       ].join('\n');
@@ -497,27 +528,25 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         ),
       );
     }
-    final approvedSessionId = (log.detailMap['approved_session_id']?.toString().trim().isNotEmpty ?? false)
+    final approvedSessionId =
+        (log.detailMap['approved_session_id']?.toString().trim().isNotEmpty ??
+            false)
         ? log.detailMap['approved_session_id'].toString()
         : log.sessionId;
     final tooltipLabel = isOidc
         ? tr(
             'ui.userfront.dashboard.approved_session.userfront',
-            fallback: '승인한 Userfront 세션 ID',
           )
         : tr(
             'ui.userfront.dashboard.approved_session.default',
-            fallback: '승인한 세션 ID',
           );
     final tooltip = approvedSessionId.isEmpty
         ? tr(
             'msg.userfront.dashboard.approved_session.none',
-            fallback: '{{label}} 없음',
             params: {'label': tooltipLabel},
           )
         : tr(
             'msg.userfront.dashboard.approved_session.copy_click',
-            fallback: '{{label}}: {{id}}\\n클릭하면 복사됩니다.',
             params: {'label': tooltipLabel, 'id': approvedSessionId},
           );
     return InkWell(
@@ -531,7 +560,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                     content: Text(
                       tr(
                         'msg.userfront.dashboard.session_id_copied',
-                        fallback: '세션 ID가 복사되었습니다.',
                       ),
                     ),
                   ),
@@ -544,8 +572,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           isOidc ? authMethod : tr('ui.common.qr', fallback: 'QR'),
           style: TextStyle(
             color: approvedSessionId.isEmpty ? _ink : Colors.blueAccent,
-            decoration:
-                approvedSessionId.isEmpty ? null : TextDecoration.underline,
+            decoration: approvedSessionId.isEmpty
+                ? null
+                : TextDecoration.underline,
           ),
         ),
       ),
@@ -555,14 +584,15 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   Widget _buildAuthMethodLine(AuditLogEntry log, String authMethod) {
     final isOidc = authMethod.contains('OIDC');
     if (authMethod != 'QR' && !isOidc) {
-      final approvedUserAgent = log.detailMap['approved_user_agent']?.toString() ?? '';
+      final approvedUserAgent =
+          log.detailMap['approved_user_agent']?.toString() ?? '';
       final approvedIp = log.detailMap['approved_ip']?.toString() ?? '';
-      final hasApproverMeta = approvedUserAgent.isNotEmpty || approvedIp.isNotEmpty;
+      final hasApproverMeta =
+          approvedUserAgent.isNotEmpty || approvedIp.isNotEmpty;
       if (!authMethod.startsWith('링크') || !hasApproverMeta) {
         return _selectableText(
           tr(
             'msg.userfront.dashboard.auth_method',
-            fallback: '인증수단: {{method}}',
             params: {'method': authMethod},
           ),
         );
@@ -571,12 +601,10 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       final tooltip = [
         tr(
           'msg.userfront.dashboard.approved_device',
-          fallback: '승인 기기: {{device}}',
           params: {'device': deviceLabel},
         ),
         tr(
           'msg.userfront.dashboard.approved_ip',
-          fallback: '승인 IP: {{ip}}',
           params: {'ip': approvedIp.isEmpty ? '-' : approvedIp},
         ),
       ].join('\n');
@@ -585,7 +613,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         child: _selectableText(
           tr(
             'msg.userfront.dashboard.auth_method',
-            fallback: '인증수단: {{method}}',
             params: {'method': authMethod},
           ),
           style: const TextStyle(
@@ -595,17 +622,17 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         ),
       );
     }
-    final approvedSessionId = (log.detailMap['approved_session_id']?.toString().trim().isNotEmpty ?? false)
+    final approvedSessionId =
+        (log.detailMap['approved_session_id']?.toString().trim().isNotEmpty ??
+            false)
         ? log.detailMap['approved_session_id'].toString()
         : log.sessionId;
     final tooltipLabel = isOidc
         ? tr(
             'ui.userfront.dashboard.approved_session.userfront',
-            fallback: '승인한 Userfront 세션 ID',
           )
         : tr(
             'ui.userfront.dashboard.approved_session.default',
-            fallback: '승인한 세션 ID',
           );
     return InkWell(
       onTap: approvedSessionId.isEmpty
@@ -618,7 +645,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                     content: Text(
                       tr(
                         'msg.userfront.dashboard.session_id_copied',
-                        fallback: '세션 ID가 복사되었습니다.',
                       ),
                     ),
                   ),
@@ -629,20 +655,19 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         message: approvedSessionId.isEmpty
             ? tr(
                 'msg.userfront.dashboard.approved_session.none',
-                fallback: '{{label}} 없음',
                 params: {'label': tooltipLabel},
               )
             : tr(
                 'msg.userfront.dashboard.approved_session.copy_tap',
-                fallback: '{{label}}: {{id}}\\n탭하면 복사됩니다.',
                 params: {'label': tooltipLabel, 'id': approvedSessionId},
               ),
         child: Text(
           tr(
             'msg.userfront.dashboard.auth_method',
-            fallback: '인증수단: {{method}}',
             params: {
-              'method': isOidc ? authMethod : tr('ui.common.qr', fallback: 'QR'),
+              'method': isOidc
+                  ? authMethod
+                  : tr('ui.common.qr', fallback: 'QR'),
             },
           ),
           style: TextStyle(
@@ -669,7 +694,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     final tooltip = clientId.isEmpty
         ? tr(
             'msg.userfront.dashboard.client_id_missing',
-            fallback: 'Client ID 없음',
           )
         : tr(
             'msg.userfront.dashboard.client_id',
@@ -691,10 +715,10 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
   String _appLabelForPath(String path) {
     if (path.startsWith('/api/v1/auth')) {
-      return tr('ui.userfront.app_label.baron', fallback: 'Baron 로그인');
+      return tr('ui.userfront.app_label.baron');
     }
     if (path.startsWith('/api/v1/user')) {
-      return tr('ui.userfront.app_label.baron', fallback: 'Baron 로그인');
+      return tr('ui.userfront.app_label.baron');
     }
     if (path.startsWith('/api/v1/dev')) {
       return tr('ui.userfront.app_label.dev_console', fallback: 'Dev Console');
@@ -705,29 +729,34 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         fallback: 'Admin Console',
       );
     }
-    return tr('ui.userfront.app_label.baron', fallback: 'Baron 로그인');
+    return tr('ui.userfront.app_label.baron');
   }
 
   @override
   Widget build(BuildContext context) {
+    if (!_isLoggedIn()) {
+      _redirectToSignin();
+      return const SizedBox.shrink();
+    }
     final isWide = MediaQuery.of(context).size.width >= sideMenuBreakpoint;
     final profileState = ref.watch(profileProvider);
     final profile = profileState.value;
     final timelineState = ref.watch(authTimelineProvider);
-    final userName = profile?.name ??
+    final userName =
+        profile?.name ??
         profile?.email ??
         profile?.phone ??
         tr('ui.userfront.profile.user_fallback', fallback: 'User');
     final department = profile?.department.isNotEmpty == true
         ? profile!.department
-        : tr('ui.userfront.profile.department_empty', fallback: '소속 정보 없음');
+        : tr('ui.userfront.profile.department_empty');
     final sessionIssuedAt = _getJwtIssuedAt();
 
     return Scaffold(
       backgroundColor: _subtle,
       appBar: AppBar(
         title: Text(
-          tr('ui.userfront.app_title', fallback: 'Baron 로그인'),
+          tr('ui.userfront.app_title'),
           style: TextStyle(fontWeight: FontWeight.bold),
         ),
         elevation: 0,
@@ -736,22 +765,24 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         actions: [
           IconButton(
             icon: const Icon(Icons.person_outline),
-            tooltip: tr('ui.userfront.nav.profile', fallback: '내 정보'),
+            tooltip: tr('ui.userfront.nav.profile'),
             onPressed: () => context.push('/profile'),
           ),
           IconButton(
             icon: const Icon(Icons.qr_code_scanner),
-            tooltip: tr('ui.userfront.nav.qr_scan', fallback: 'QR 스캔'),
+            tooltip: tr('ui.userfront.nav.qr_scan'),
             onPressed: _onScanQR,
           ),
           IconButton(
             icon: const Icon(Icons.logout),
-            tooltip: tr('ui.userfront.nav.logout', fallback: '로그아웃'),
+            tooltip: tr('ui.userfront.nav.logout'),
             onPressed: _logout,
           ),
         ],
       ),
-      drawer: isWide ? null : Drawer(child: _buildSideMenu(context, closeOnTap: true)),
+      drawer: isWide
+          ? null
+          : Drawer(child: _buildSideMenu(context, closeOnTap: true)),
       body: Row(
         children: [
           if (isWide)
@@ -775,24 +806,28 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           if (!isMobile) ...[
-                            _buildHeaderCard(userName, department, sessionIssuedAt),
+                            _buildHeaderCard(
+                              userName,
+                              department,
+                              sessionIssuedAt,
+                            ),
                             const SizedBox(height: 28),
                           ],
                           _buildSectionTitle(
-                            tr('ui.userfront.sections.apps', fallback: '나의 App 현황'),
+                            tr(
+                              'ui.userfront.sections.apps',
+                            ),
                             tr(
                               'msg.userfront.sections.apps_subtitle',
-                              fallback: '현재 연결된 앱과 최근 인증 상태입니다.',
                             ),
                           ),
                           const SizedBox(height: 12),
                           _buildActivitySection(isMobile),
                           const SizedBox(height: 28),
                           _buildSectionTitle(
-                            tr('ui.userfront.sections.audit', fallback: '접속이력'),
+                            tr('ui.userfront.sections.audit'),
                             tr(
                               'msg.userfront.sections.audit_subtitle',
-                              fallback: 'Baron 로그인 기준의 최근 접근 기록입니다.',
                             ),
                           ),
                           const SizedBox(height: 12),
@@ -810,20 +845,27 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     );
   }
 
-  Widget _buildHeaderCard(String userName, String department, DateTime? issuedAt) {
+  Widget _buildHeaderCard(
+    String userName,
+    String department,
+    DateTime? issuedAt,
+  ) {
     final sessionLabel = issuedAt != null
         ? _formatDateTime(issuedAt)
-        : tr('ui.userfront.session.unknown', fallback: '알 수 없음');
+        : tr('ui.userfront.session.unknown');
     final infoColumn = Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
           tr(
             'msg.userfront.greeting',
-            fallback: '안녕하세요, {{name}}님',
             params: {'name': userName},
           ),
-          style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: _ink),
+          style: const TextStyle(
+            fontSize: 22,
+            fontWeight: FontWeight.bold,
+            color: _ink,
+          ),
         ),
         const SizedBox(height: 6),
         Text(
@@ -837,7 +879,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           children: [
             _buildInfoChip(
               Icons.verified_user,
-              tr('ui.userfront.session.active', fallback: '세션 활성'),
+              tr('ui.userfront.session.active'),
             ),
             _buildInfoChip(Icons.lock_outline, _authMethodLabel()),
             _buildInfoChip(Icons.access_time, sessionLabel),
@@ -871,13 +913,14 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       children: [
         Text(
           title,
-          style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w700, color: _ink),
+          style: const TextStyle(
+            fontSize: 18,
+            fontWeight: FontWeight.w700,
+            color: _ink,
+          ),
         ),
         const SizedBox(width: 12),
-        Text(
-          subtitle,
-          style: TextStyle(fontSize: 13, color: Colors.grey[600]),
-        ),
+        Text(subtitle, style: TextStyle(fontSize: 13, color: Colors.grey[600])),
       ],
     );
   }
@@ -897,7 +940,11 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           const SizedBox(width: 6),
           Text(
             label,
-            style: const TextStyle(fontSize: 12, color: _ink, fontWeight: FontWeight.w600),
+            style: const TextStyle(
+              fontSize: 12,
+              color: _ink,
+              fontWeight: FontWeight.w600,
+            ),
           ),
         ],
       ),
@@ -918,15 +965,17 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               Text(
                 tr(
                   'msg.userfront.dashboard.activities.empty',
-                  fallback: '연동된 앱이 없습니다.',
                 ),
-                style: TextStyle(fontSize: 14, color: Colors.grey[700], fontWeight: FontWeight.w600),
+                style: TextStyle(
+                  fontSize: 14,
+                  color: Colors.grey[700],
+                  fontWeight: FontWeight.w600,
+                ),
               ),
               const SizedBox(height: 6),
               Text(
                 tr(
                   'msg.userfront.dashboard.activities.empty_detail',
-                  fallback: '앱을 연동하면 최근 활동과 상태가 표시됩니다.',
                 ),
                 style: TextStyle(fontSize: 12, color: Colors.grey[600]),
               ),
@@ -945,37 +994,35 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           Text(
             tr(
               'msg.userfront.dashboard.activities.error',
-              fallback: '연동 정보를 불러오지 못했습니다.',
             ),
             style: TextStyle(fontSize: 12, color: Colors.grey[600]),
           ),
           const SizedBox(height: 8),
           TextButton(
             onPressed: () => ref.read(linkedRpsProvider.notifier).refresh(),
-            child: Text(tr('ui.common.retry', fallback: '다시 시도')),
+            child: Text(tr('ui.common.retry')),
           ),
         ],
       ),
     );
   }
 
-
-
   List<_ActivityItem> _buildActivityItems(List<LinkedRp> linkedRps) {
     final items = <_ActivityItem>[];
     for (final rp in linkedRps) {
       final normalizedStatus = rp.status.toLowerCase();
       // status가 'inactive'로 내려올 수 있으므로 이를 반영
-      final isActiveInApi = normalizedStatus == 'active' || normalizedStatus == '';
+      final isActiveInApi =
+          normalizedStatus == 'active' || normalizedStatus == '';
       final isRevoked = !isActiveInApi;
 
       final lastAuthLabel = rp.lastAuthenticatedAt != null
           ? _formatDateTime(rp.lastAuthenticatedAt!)
-          : tr('ui.userfront.dashboard.activity.linked', fallback: '연동됨');
+          : tr('ui.userfront.dashboard.activity.linked');
 
       final statusCode = isRevoked ? 'revoked' : 'active';
       final name = rp.name.isNotEmpty ? rp.name : rp.id;
-      
+
       items.add(
         _ActivityItem(
           clientId: rp.id,
@@ -995,17 +1042,17 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     items.sort((a, b) {
       final aActive = a.status == 'active';
       final bActive = b.status == 'active';
-      
+
       if (aActive && !bActive) return -1;
       if (!aActive && bActive) return 1;
-      
+
       // 둘 다 활성이거나 둘 다 비활성인 경우 최근 인증순 내림차순
       if (a.lastAuthDateTime != null && b.lastAuthDateTime != null) {
         return b.lastAuthDateTime!.compareTo(a.lastAuthDateTime!);
       }
       if (a.lastAuthDateTime != null) return -1;
       if (b.lastAuthDateTime != null) return 1;
-      
+
       return 0;
     });
 
@@ -1018,7 +1065,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     return LayoutBuilder(
       builder: (context, constraints) {
         final maxWidth = constraints.maxWidth;
-        
+
         // 화면 너비에 따른 컬럼 수 및 초기 표시 개수 결정
         int crossAxisCount;
         if (maxWidth > 1200) {
@@ -1042,7 +1089,8 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
 
         // 카드의 너비를 화면 너비에 맞춰 계산 (여백 고려)
         final double spacing = 12.0;
-        final double cardWidth = (maxWidth - (spacing * (crossAxisCount - 1))) / crossAxisCount;
+        final double cardWidth =
+            (maxWidth - (spacing * (crossAxisCount - 1))) / crossAxisCount;
 
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -1063,18 +1111,24 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 child: Align(
                   alignment: Alignment.centerRight,
                   child: TextButton.icon(
-                    onPressed: () => setState(() => _showAllActivities = !_showAllActivities),
+                    onPressed: () => setState(
+                      () => _showAllActivities = !_showAllActivities,
+                    ),
                     icon: Icon(
                       _showAllActivities ? Icons.keyboard_arrow_up : Icons.add,
                       size: 18,
-                      color: _showAllActivities ? Colors.grey : Colors.blueAccent,
+                      color: _showAllActivities
+                          ? Colors.grey
+                          : Colors.blueAccent,
                     ),
                     label: Text(
                       _showAllActivities
-                          ? tr('ui.common.collapse', fallback: '접기')
-                          : tr('ui.common.show_more', fallback: '+ 더보기'),
+                          ? tr('ui.common.collapse')
+                          : tr('ui.common.show_more'),
                       style: TextStyle(
-                        color: _showAllActivities ? Colors.grey : Colors.blueAccent,
+                        color: _showAllActivities
+                            ? Colors.grey
+                            : Colors.blueAccent,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
@@ -1090,7 +1144,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
   Widget _buildActivityCard(_ActivityItem item, {double? cardWidth}) {
     final isActive = item.status == 'active';
     final statusColor = isActive ? Colors.green : Colors.grey;
-    final borderColor = isActive ? Colors.green.withValues(alpha: 128) : _border;
+    final borderColor = isActive
+        ? Colors.green.withValues(alpha: 128)
+        : _border;
     final borderWidth = isActive ? 1.5 : 1.0;
 
     // 활성 상태면 클릭 가능 (URL 유무와 관계없이)
@@ -1104,13 +1160,15 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         color: _surface,
         borderRadius: BorderRadius.circular(14),
         border: Border.all(color: borderColor, width: borderWidth),
-        boxShadow: isActive ? [
-          BoxShadow(
-            color: Colors.green.withValues(alpha: 13),
-            blurRadius: 10,
-            offset: const Offset(0, 4),
-          )
-        ] : null,
+        boxShadow: isActive
+            ? [
+                BoxShadow(
+                  color: Colors.green.withValues(alpha: 13),
+                  blurRadius: 10,
+                  offset: const Offset(0, 4),
+                ),
+              ]
+            : null,
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -1120,7 +1178,11 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               Expanded(
                 child: Text(
                   item.appName,
-                  style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: _ink),
+                  style: const TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                    color: _ink,
+                  ),
                 ),
               ),
               Container(
@@ -1131,22 +1193,32 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                 ),
                 child: Text(
                   item.status == 'active'
-                      ? tr('ui.common.status.active', fallback: '활성')
-                      : tr('ui.userfront.dashboard.status.revoked', fallback: '해지됨'),
-                  style: TextStyle(fontSize: 11, color: statusColor, fontWeight: FontWeight.w600),
+                      ? tr('ui.common.status.active')
+                      : tr(
+                          'ui.userfront.dashboard.status.revoked',
+                        ),
+                  style: TextStyle(
+                    fontSize: 11,
+                    color: statusColor,
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
               ),
             ],
           ),
           const SizedBox(height: 12),
           Text(
-            tr('ui.userfront.dashboard.last_auth_label', fallback: '최근 인증'),
+            tr('ui.userfront.dashboard.last_auth_label'),
             style: TextStyle(fontSize: 12, color: Colors.grey[600]),
           ),
           const SizedBox(height: 4),
           Text(
             item.lastAuthAt,
-            style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: _ink),
+            style: const TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w600,
+              color: _ink,
+            ),
           ),
           const SizedBox(height: 16),
           Row(
@@ -1160,7 +1232,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                     padding: const EdgeInsets.symmetric(vertical: 8),
                   ),
                   child: Text(
-                    tr('ui.common.details', fallback: '상세정보'),
+                    tr('ui.common.details'),
                     style: const TextStyle(fontSize: 13),
                   ),
                 ),
@@ -1168,22 +1240,36 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               const SizedBox(width: 8),
               Expanded(
                 child: OutlinedButton(
-                  onPressed: (_isRevoking || item.isRevoked) ? null : item.onRevoke,
+                  onPressed: (_isRevoking || item.isRevoked)
+                      ? null
+                      : item.onRevoke,
                   style: OutlinedButton.styleFrom(
-                    foregroundColor: item.isRevoked ? Colors.grey : Colors.redAccent,
-                    side: BorderSide(color: item.isRevoked ? Colors.grey : Colors.redAccent, width: 0.5),
+                    foregroundColor: item.isRevoked
+                        ? Colors.grey
+                        : Colors.redAccent,
+                    side: BorderSide(
+                      color: item.isRevoked ? Colors.grey : Colors.redAccent,
+                      width: 0.5,
+                    ),
                     padding: const EdgeInsets.symmetric(vertical: 8),
                   ),
                   child: _isRevoking && !item.isRevoked
                       ? const SizedBox(
                           width: 14,
                           height: 14,
-                          child: CircularProgressIndicator(strokeWidth: 2, color: Colors.redAccent),
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                            color: Colors.redAccent,
+                          ),
                         )
                       : Text(
                           item.isRevoked
-                              ? tr('ui.userfront.dashboard.status.revoked', fallback: '해지됨')
-                              : tr('ui.userfront.dashboard.revoke.title', fallback: '연동 해지'),
+                              ? tr(
+                                  'ui.userfront.dashboard.status.revoked',
+                                )
+                              : tr(
+                                  'ui.userfront.dashboard.revoke.title',
+                                ),
                           style: const TextStyle(fontSize: 13),
                         ),
                 ),
@@ -1220,7 +1306,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                   content: Text(
                     tr(
                       'msg.userfront.dashboard.link_open_error',
-                      fallback: '해당 링크를 열 수 없습니다.',
                     ),
                   ),
                 ),
@@ -1232,7 +1317,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                   content: Text(
                     tr(
                       'msg.userfront.dashboard.link_missing',
-                      fallback: '이동할 페이지 주소(Client URI)가 설정되지 않았습니다.',
                     ),
                   ),
                 ),
@@ -1263,13 +1347,13 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               Text(
                 tr(
                   'msg.userfront.dashboard.audit_load_error',
-                  fallback: '접속이력을 불러오지 못했습니다.',
                 ),
               ),
               const SizedBox(height: 8),
               TextButton(
-                onPressed: () => ref.read(authTimelineProvider.notifier).refresh(),
-                child: Text(tr('ui.common.retry', fallback: '다시 시도')),
+                onPressed: () =>
+                    ref.read(authTimelineProvider.notifier).refresh(),
+                child: Text(tr('ui.common.retry')),
               ),
             ],
           ),
@@ -1283,7 +1367,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           child: Text(
             tr(
               'msg.userfront.dashboard.audit_empty',
-              fallback: '최근 접속 이력이 없습니다.',
             ),
             style: TextStyle(color: Colors.grey[600]),
           ),
@@ -1326,17 +1409,22 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                     columns: [
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.session_id', fallback: 'Session ID'),
+                          tr(
+                            'ui.userfront.audit.table.session_id',
+                            fallback: 'Session ID',
+                          ),
                         ),
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.date', fallback: '접속일자'),
+                          tr('ui.userfront.audit.table.date'),
                         ),
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.app', fallback: '애플리케이션'),
+                          tr(
+                            'ui.userfront.audit.table.app',
+                          ),
                         ),
                       ),
                       DataColumn(
@@ -1346,70 +1434,85 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.device', fallback: '접속환경'),
+                          tr(
+                            'ui.userfront.audit.table.device',
+                          ),
                         ),
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.auth_method', fallback: '인증수단'),
+                          tr(
+                            'ui.userfront.audit.table.auth_method',
+                          ),
                         ),
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.result', fallback: '인증결과'),
+                          tr(
+                            'ui.userfront.audit.table.result',
+                          ),
                         ),
                       ),
                       DataColumn(
                         label: Text(
-                          tr('ui.userfront.audit.table.status', fallback: '현황'),
+                          tr('ui.userfront.audit.table.status'),
                         ),
                       ),
                     ],
                     rows: state.items.map((log) {
                       final statusLabel = log.status == 'success'
-                          ? tr('ui.common.status.success', fallback: '성공')
-                          : tr('ui.common.status.failure', fallback: '실패');
-                      final statusColor =
-                          log.status == 'success' ? Colors.green : Colors.redAccent;
+                          ? tr('ui.common.status.success')
+                          : tr('ui.common.status.failure');
+                      final statusColor = log.status == 'success'
+                          ? Colors.green
+                          : Colors.redAccent;
                       final authMethod = log.authMethod.isNotEmpty
                           ? log.authMethod
                           : _authMethodLabel();
-                      final deviceLabel = _deviceLabelFromUserAgent(log.userAgent);
-                      return DataRow(cells: [
-                        DataCell(
-                          _selectableText(
-                            log.sessionId.isEmpty
-                                ? tr('ui.common.hyphen', fallback: '-')
-                                : log.sessionId,
-                          ),
-                        ),
-                        DataCell(_selectableText(_formatDateTime(log.timestamp))),
-                        DataCell(_buildAppCell(log)),
-                        DataCell(
-                          _selectableText(
-                            log.ipAddress.isEmpty
-                                ? tr('ui.common.hyphen', fallback: '-')
-                                : log.ipAddress,
-                          ),
-                        ),
-                        DataCell(_selectableText(deviceLabel)),
-                        DataCell(_buildAuthMethodCell(log, authMethod)),
-                        DataCell(
-                          _selectableText(
-                            statusLabel,
-                            style: TextStyle(
-                              color: statusColor,
-                              fontWeight: FontWeight.w600,
+                      final deviceLabel = _deviceLabelFromUserAgent(
+                        log.userAgent,
+                      );
+                      return DataRow(
+                        cells: [
+                          DataCell(
+                            _selectableText(
+                              log.sessionId.isEmpty
+                                  ? tr('ui.common.hyphen', fallback: '-')
+                                  : log.sessionId,
                             ),
                           ),
-                        ),
-                        DataCell(
-                          _selectableText(
-                            tr('ui.userfront.audit.table.pending', fallback: '(준비중)'),
-                            style: const TextStyle(color: Colors.grey),
+                          DataCell(
+                            _selectableText(_formatDateTime(log.timestamp)),
                           ),
-                        ),
-                      ]);
+                          DataCell(_buildAppCell(log)),
+                          DataCell(
+                            _selectableText(
+                              log.ipAddress.isEmpty
+                                  ? tr('ui.common.hyphen', fallback: '-')
+                                  : log.ipAddress,
+                            ),
+                          ),
+                          DataCell(_selectableText(deviceLabel)),
+                          DataCell(_buildAuthMethodCell(log, authMethod)),
+                          DataCell(
+                            _selectableText(
+                              statusLabel,
+                              style: TextStyle(
+                                color: statusColor,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                          DataCell(
+                            _selectableText(
+                              tr(
+                                'ui.userfront.audit.table.pending',
+                              ),
+                              style: const TextStyle(color: Colors.grey),
+                            ),
+                          ),
+                        ],
+                      );
                     }).toList(),
                   ),
                 ),
@@ -1443,15 +1546,20 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                       Expanded(
                         child: _buildAppCell(
                           log,
-                          style: const TextStyle(fontWeight: FontWeight.w600, color: _ink),
+                          style: const TextStyle(
+                            fontWeight: FontWeight.w600,
+                            color: _ink,
+                          ),
                         ),
                       ),
                       _selectableText(
                         log.status == 'success'
-                            ? tr('ui.common.status.success', fallback: '성공')
-                            : tr('ui.common.status.failure', fallback: '실패'),
+                            ? tr('ui.common.status.success')
+                            : tr('ui.common.status.failure'),
                         style: TextStyle(
-                          color: log.status == 'success' ? Colors.green : Colors.redAccent,
+                          color: log.status == 'success'
+                              ? Colors.green
+                              : Colors.redAccent,
                           fontWeight: FontWeight.w600,
                         ),
                       ),
@@ -1472,14 +1580,12 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                   _selectableText(
                     tr(
                       'msg.userfront.audit.date',
-                      fallback: '접속일자: {{value}}',
                       params: {'value': _formatDateTime(log.timestamp)},
                     ),
                   ),
                   _selectableText(
                     tr(
                       'msg.userfront.audit.ip',
-                      fallback: '접속 IP: {{value}}',
                       params: {
                         'value': log.ipAddress.isEmpty
                             ? tr('ui.common.hyphen', fallback: '-')
@@ -1490,27 +1596,29 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
                   _selectableText(
                     tr(
                       'msg.userfront.audit.device',
-                      fallback: '접속환경: {{value}}',
-                      params: {'value': _deviceLabelFromUserAgent(log.userAgent)},
+                      params: {
+                        'value': _deviceLabelFromUserAgent(log.userAgent),
+                      },
                     ),
                   ),
-                  _buildAuthMethodLine(log, log.authMethod.isNotEmpty ? log.authMethod : _authMethodLabel()),
+                  _buildAuthMethodLine(
+                    log,
+                    log.authMethod.isNotEmpty
+                        ? log.authMethod
+                        : _authMethodLabel(),
+                  ),
                   _selectableText(
                     tr(
                       'msg.userfront.audit.result',
-                      fallback: '인증결과: {{value}}',
                       params: {
                         'value': log.status == 'success'
-                            ? tr('ui.common.status.success', fallback: '성공')
-                            : tr('ui.common.status.failure', fallback: '실패'),
+                            ? tr('ui.common.status.success')
+                            : tr('ui.common.status.failure'),
                       },
                     ),
                   ),
                   _selectableText(
-                    tr(
-                      'msg.userfront.audit.status',
-                      fallback: '현황: (준비중)',
-                    ),
+                    tr('msg.userfront.audit.status'),
                     style: TextStyle(color: Colors.grey[600]),
                   ),
                 ],
@@ -1538,12 +1646,12 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
             Text(
               tr(
                 'msg.userfront.audit.load_more_error',
-                fallback: '더 불러오지 못했습니다.',
               ),
             ),
             TextButton(
-              onPressed: () => ref.read(authTimelineProvider.notifier).loadMore(),
-              child: Text(tr('ui.common.retry', fallback: '재시도')),
+              onPressed: () =>
+                  ref.read(authTimelineProvider.notifier).loadMore(),
+              child: Text(tr('ui.common.retry')),
             ),
           ],
         ),
@@ -1553,13 +1661,34 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       return Padding(
         padding: const EdgeInsets.only(top: 8),
         child: Text(
-          tr('msg.userfront.audit.end', fallback: '더 이상 항목이 없습니다.'),
+          tr('msg.userfront.audit.end'),
           style: TextStyle(color: Colors.grey[600], fontSize: 12),
         ),
       );
     }
     return const SizedBox.shrink();
   }
+
+  bool _isLoggedIn() {
+    return AuthTokenStore.getToken() != null || AuthTokenStore.usesCookie();
+  }
+
+  void _redirectToSignin() {
+    if (!mounted || _redirectingToSignin) {
+      return;
+    }
+    _redirectingToSignin = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      final uri = GoRouterState.of(context).uri;
+      final localeCode =
+          extractLocaleFromPath(uri) ?? resolvePreferredLocaleCode();
+      context.go('/$localeCode/signin');
+      _redirectingToSignin = false;
+    });
+  }
 }
 
 class _ActivityItem {
diff --git a/userfront/lib/features/profile/data/repositories/profile_repository.dart b/userfront/lib/features/profile/data/repositories/profile_repository.dart
index c5659f50..7228518f 100644
--- a/userfront/lib/features/profile/data/repositories/profile_repository.dart
+++ b/userfront/lib/features/profile/data/repositories/profile_repository.dart
@@ -25,7 +25,7 @@ class ProfileRepository {
     final useCookie = AuthTokenStore.usesCookie();
     if (token == null && !useCookie) {
       throw Exception(
-        tr('err.userfront.session.missing', fallback: '활성 세션이 없습니다.'),
+        tr('err.userfront.session.missing'),
       );
     }
 
@@ -46,7 +46,6 @@ class ProfileRepository {
       throw Exception(
         tr(
           'err.userfront.profile.load_failed',
-          fallback: '프로필을 불러오지 못했습니다: {{error}}',
           params: {'error': response.body},
         ),
       );
@@ -62,7 +61,7 @@ class ProfileRepository {
     final useCookie = AuthTokenStore.usesCookie();
     if (token == null && !useCookie) {
       throw Exception(
-        tr('err.userfront.session.missing', fallback: '활성 세션이 없습니다.'),
+        tr('err.userfront.session.missing'),
       );
     }
 
@@ -89,7 +88,6 @@ class ProfileRepository {
       throw Exception(
         tr(
           'err.userfront.profile.update_failed',
-          fallback: '프로필 업데이트에 실패했습니다: {{error}}',
           params: {'error': response.body},
         ),
       );
@@ -101,7 +99,7 @@ class ProfileRepository {
     final useCookie = AuthTokenStore.usesCookie();
     if (token == null && !useCookie) {
       throw Exception(
-        tr('err.userfront.session.missing', fallback: '활성 세션이 없습니다.'),
+        tr('err.userfront.session.missing'),
       );
     }
 
@@ -124,7 +122,6 @@ class ProfileRepository {
       throw Exception(
         tr(
           'err.userfront.profile.send_code_failed',
-          fallback: '인증번호 전송 실패: {{error}}',
           params: {'error': response.body},
         ),
       );
@@ -139,7 +136,7 @@ class ProfileRepository {
     final useCookie = AuthTokenStore.usesCookie();
     if (token == null && !useCookie) {
       throw Exception(
-        tr('err.userfront.session.missing', fallback: '활성 세션이 없습니다.'),
+        tr('err.userfront.session.missing'),
       );
     }
 
@@ -165,7 +162,6 @@ class ProfileRepository {
       throw Exception(
         tr(
           'err.userfront.profile.password_change_failed',
-          fallback: '비밀번호 변경에 실패했습니다: {{error}}',
           params: {'error': response.body},
         ),
       );
@@ -177,7 +173,7 @@ class ProfileRepository {
     final useCookie = AuthTokenStore.usesCookie();
     if (token == null && !useCookie) {
       throw Exception(
-        tr('err.userfront.session.missing', fallback: '활성 세션이 없습니다.'),
+        tr('err.userfront.session.missing'),
       );
     }
 
@@ -200,7 +196,6 @@ class ProfileRepository {
       throw Exception(
         tr(
           'err.userfront.profile.verify_code_failed',
-          fallback: '인증 실패: {{error}}',
           params: {'error': response.body},
         ),
       );
diff --git a/userfront/lib/features/profile/presentation/pages/profile_page.dart b/userfront/lib/features/profile/presentation/pages/profile_page.dart
index 0965dfef..b7da7e7b 100644
--- a/userfront/lib/features/profile/presentation/pages/profile_page.dart
+++ b/userfront/lib/features/profile/presentation/pages/profile_page.dart
@@ -5,6 +5,7 @@ import 'package:userfront/i18n.dart';
 import '../../../../core/notifiers/auth_notifier.dart';
 import '../../../../core/services/auth_token_store.dart';
 import '../../../../core/ui/layout_breakpoints.dart';
+import '../../../../core/widgets/language_selector.dart';
 import '../../data/models/user_profile_model.dart';
 import '../../domain/notifiers/profile_notifier.dart';
 
@@ -140,7 +141,8 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     if (_editingField != 'name' && _nameController!.text != profile.name) {
       _nameController!.text = profile.name;
     }
-    if (_editingField != 'department' && _departmentController!.text != profile.department) {
+    if (_editingField != 'department' &&
+        _departmentController!.text != profile.department) {
       _departmentController!.text = profile.department;
     }
     if (_editingField != 'phone' && _phoneController!.text != profile.phone) {
@@ -234,7 +236,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.phone.code_sent',
-                fallback: '인증번호가 전송되었습니다.',
               ),
             ),
           ),
@@ -248,7 +249,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.phone.send_failed',
-                fallback: '전송 실패: {{error}}',
                 params: {'error': e.toString()},
               ),
             ),
@@ -274,10 +274,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
             content: Text(
-              tr(
-                'msg.userfront.profile.phone.verified',
-                fallback: '인증되었습니다.',
-              ),
+              tr('msg.userfront.profile.phone.verified'),
             ),
           ),
         );
@@ -293,7 +290,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.phone.verify_failed',
-                fallback: '인증 실패: {{error}}',
                 params: {'error': e.toString()},
               ),
             ),
@@ -310,24 +306,27 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     final confirmPassword = _confirmPasswordController?.text.trim() ?? '';
 
     if (currentPassword.isEmpty) {
-      setState(() => _passwordError = tr(
-            'msg.userfront.profile.password.current_required',
-            fallback: '현재 비밀번호를 입력해 주세요.',
-          ));
+      setState(
+        () => _passwordError = tr(
+          'msg.userfront.profile.password.current_required',
+        ),
+      );
       return;
     }
     if (newPassword.isEmpty) {
-      setState(() => _passwordError = tr(
-            'msg.userfront.profile.password.new_required',
-            fallback: '새 비밀번호를 입력해 주세요.',
-          ));
+      setState(
+        () => _passwordError = tr(
+          'msg.userfront.profile.password.new_required',
+        ),
+      );
       return;
     }
     if (newPassword != confirmPassword) {
-      setState(() => _passwordError = tr(
-            'msg.userfront.profile.password.mismatch',
-            fallback: '새 비밀번호가 일치하지 않습니다.',
-          ));
+      setState(
+        () => _passwordError = tr(
+          'msg.userfront.profile.password.mismatch',
+        ),
+      );
       return;
     }
 
@@ -338,7 +337,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     });
 
     try {
-      await ref.read(profileRepositoryProvider).changePassword(
+      await ref
+          .read(profileRepositoryProvider)
+          .changePassword(
             currentPassword: currentPassword,
             newPassword: newPassword,
           );
@@ -348,7 +349,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       setState(() {
         _passwordSuccess = tr(
           'msg.userfront.profile.password.changed',
-          fallback: '비밀번호가 변경되었습니다.',
         );
       });
     } catch (e) {
@@ -356,7 +356,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       setState(() {
         _passwordError = tr(
           'msg.userfront.profile.password.change_failed',
-          fallback: '비밀번호 변경 실패: {{error}}',
           params: {'error': message},
         );
       });
@@ -434,10 +433,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           content: Text(
-            tr(
-              'msg.userfront.profile.name_required',
-              fallback: '이름을 입력해주세요.',
-            ),
+            tr('msg.userfront.profile.name_required'),
           ),
         ),
       );
@@ -449,7 +445,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
           content: Text(
             tr(
               'msg.userfront.profile.department_required',
-              fallback: '소속을 입력해주세요.',
             ),
           ),
         ),
@@ -463,7 +458,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.phone_required',
-                fallback: '휴대폰 번호를 입력해주세요.',
               ),
             ),
           ),
@@ -476,7 +470,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.phone_verify_required',
-                fallback: '휴대폰 번호 인증이 필요합니다.',
               ),
             ),
           ),
@@ -500,7 +493,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     _isSavingField = true;
 
     try {
-      await ref.read(profileProvider.notifier).updateProfile(
+      await ref
+          .read(profileProvider.notifier)
+          .updateProfile(
             name: nextName,
             phone: nextPhone,
             department: nextDepartment,
@@ -520,7 +515,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.update_success',
-                fallback: '정보가 수정되었습니다.',
               ),
             ),
           ),
@@ -533,7 +527,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             content: Text(
               tr(
                 'msg.userfront.profile.update_failed',
-                fallback: '수정 실패: {{error}}',
                 params: {'error': e.toString()},
               ),
             ),
@@ -546,38 +539,40 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
   }
 
   Widget _buildSideMenu(BuildContext context) {
-    return ListView(
-      padding: const EdgeInsets.symmetric(vertical: 12),
+    return Column(
       children: [
-        ListTile(
-          leading: const Icon(Icons.home_outlined),
-          title: Text(
-            tr('ui.userfront.nav.dashboard', fallback: '대시보드'),
+        Expanded(
+          child: ListView(
+            padding: const EdgeInsets.symmetric(vertical: 12),
+            children: [
+              ListTile(
+                leading: const Icon(Icons.home_outlined),
+                title: Text(tr('ui.userfront.nav.dashboard')),
+                onTap: () => context.go('/'),
+              ),
+              ListTile(
+                leading: const Icon(Icons.person_outline),
+                title: Text(tr('ui.userfront.nav.profile')),
+                selected: true,
+                onTap: () => context.go('/profile'),
+              ),
+              ListTile(
+                leading: const Icon(Icons.qr_code_scanner),
+                title: Text(tr('ui.userfront.nav.qr_scan')),
+                onTap: () => context.go('/scan'),
+              ),
+              const Divider(),
+              ListTile(
+                leading: const Icon(Icons.logout),
+                title: Text(tr('ui.userfront.nav.logout')),
+                onTap: _logout,
+              ),
+            ],
           ),
-          onTap: () => context.go('/'),
         ),
-        ListTile(
-          leading: const Icon(Icons.person_outline),
-          title: Text(
-            tr('ui.userfront.nav.profile', fallback: '내 정보'),
-          ),
-          selected: true,
-          onTap: () => context.go('/profile'),
-        ),
-        ListTile(
-          leading: const Icon(Icons.qr_code_scanner),
-          title: Text(
-            tr('ui.userfront.nav.qr_scan', fallback: 'QR 스캔'),
-          ),
-          onTap: () => context.go('/scan'),
-        ),
-        const Divider(),
-        ListTile(
-          leading: const Icon(Icons.logout),
-          title: Text(
-            tr('ui.userfront.nav.logout', fallback: '로그아웃'),
-          ),
-          onTap: _logout,
+        const Padding(
+          padding: EdgeInsets.only(bottom: 16),
+          child: LanguageSelector(compact: true),
         ),
       ],
     );
@@ -589,13 +584,14 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       children: [
         Text(
           title,
-          style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w700, color: _ink),
+          style: const TextStyle(
+            fontSize: 18,
+            fontWeight: FontWeight.w700,
+            color: _ink,
+          ),
         ),
         const SizedBox(width: 12),
-        Text(
-          subtitle,
-          style: TextStyle(fontSize: 13, color: Colors.grey[600]),
-        ),
+        Text(subtitle, style: TextStyle(fontSize: 13, color: Colors.grey[600])),
       ],
     );
   }
@@ -615,7 +611,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
           const SizedBox(width: 6),
           Text(
             label,
-            style: const TextStyle(fontSize: 12, color: _ink, fontWeight: FontWeight.w600),
+            style: const TextStyle(
+              fontSize: 12,
+              color: _ink,
+              fontWeight: FontWeight.w600,
+            ),
           ),
         ],
       ),
@@ -624,13 +624,13 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
 
   Widget _buildHeaderCard(UserProfile profile) {
     final name = profile.name.isEmpty
-        ? tr('msg.userfront.profile.name_missing', fallback: '이름 없음')
+        ? tr('msg.userfront.profile.name_missing')
         : profile.name;
     final email = profile.email.isEmpty
-        ? tr('msg.userfront.profile.email_missing', fallback: '이메일 없음')
+        ? tr('msg.userfront.profile.email_missing')
         : profile.email;
     final department = profile.department.isEmpty
-        ? tr('msg.userfront.profile.department_missing', fallback: '소속 정보 없음')
+        ? tr('msg.userfront.profile.department_missing')
         : profile.department;
 
     return Container(
@@ -650,10 +650,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       ),
       child: Row(
         children: [
-          const CircleAvatar(
-            radius: 32,
-            child: Icon(Icons.person, size: 32),
-          ),
+          const CircleAvatar(radius: 32, child: Icon(Icons.person, size: 32)),
           const SizedBox(width: 16),
           Expanded(
             child: Column(
@@ -662,7 +659,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                 Text(
                   tr(
                     'msg.userfront.profile.greeting',
-                    fallback: '안녕하세요, {{name}}님',
                     params: {'name': name},
                   ),
                   style: const TextStyle(
@@ -672,7 +668,10 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                   ),
                 ),
                 const SizedBox(height: 6),
-                Text(email, style: TextStyle(color: Colors.grey[600], fontSize: 14)),
+                Text(
+                  email,
+                  style: TextStyle(color: Colors.grey[600], fontSize: 14),
+                ),
                 const SizedBox(height: 12),
                 Wrap(
                   spacing: 8,
@@ -680,9 +679,12 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                   children: [
                     _buildInfoChip(
                       Icons.badge_outlined,
-                      tr('ui.userfront.profile.manage', fallback: '프로필 관리'),
+                      tr('ui.userfront.profile.manage'),
+                    ),
+                    _buildInfoChip(
+                      Icons.apartment,
+                      profile.tenant?.name ?? department,
                     ),
-                    _buildInfoChip(Icons.apartment, profile.tenant?.name ?? department),
                   ],
                 ),
               ],
@@ -720,7 +722,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       title: Text(label),
       subtitle: Text(displayValue),
       trailing: Text(
-        tr('ui.common.read_only', fallback: '읽기 전용'),
+        tr('ui.common.read_only'),
         style: TextStyle(color: Colors.grey[500], fontSize: 12),
       ),
     );
@@ -744,7 +746,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         subtitle: Text(displayValue),
         trailing: TextButton(
           onPressed: isUpdating ? null : () => _startEditing(field, profile),
-          child: Text(tr('ui.common.edit', fallback: '수정')),
+          child: Text(tr('ui.common.edit')),
         ),
       );
     }
@@ -772,7 +774,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             const SizedBox(width: 12),
             OutlinedButton(
               onPressed: isUpdating ? null : () => _cancelEditing(profile),
-              child: Text(tr('ui.common.cancel', fallback: '취소')),
+              child: Text(tr('ui.common.cancel')),
             ),
           ],
         ),
@@ -787,13 +789,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     if (!isEditing) {
       return ListTile(
         contentPadding: EdgeInsets.zero,
-        title: Text(
-          tr('ui.userfront.profile.phone.title', fallback: '전화번호'),
-        ),
+        title: Text(tr('ui.userfront.profile.phone.title')),
         subtitle: Text(displayValue),
         trailing: TextButton(
           onPressed: isUpdating ? null : () => _startEditing('phone', profile),
-          child: Text(tr('ui.common.edit', fallback: '수정')),
+          child: Text(tr('ui.common.edit')),
         ),
       );
     }
@@ -802,7 +802,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
-          tr('ui.userfront.profile.phone.title', fallback: '전화번호'),
+          tr('ui.userfront.profile.phone.title'),
           style: const TextStyle(fontWeight: FontWeight.w600),
         ),
         const SizedBox(height: 8),
@@ -832,17 +832,16 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                 onPressed: _isVerifying ? null : _sendCode,
                 child: Text(
                   _isCodeSent
-                      ? tr('ui.common.resend', fallback: '재전송')
+                      ? tr('ui.common.resend')
                       : tr(
                           'ui.userfront.profile.phone.request_code',
-                          fallback: '인증요청',
                         ),
                 ),
               ),
             const SizedBox(width: 8),
             OutlinedButton(
               onPressed: isUpdating ? null : () => _cancelEditing(profile),
-              child: Text(tr('ui.common.cancel', fallback: '취소')),
+              child: Text(tr('ui.common.cancel')),
             ),
           ],
         ),
@@ -862,7 +861,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                     border: const OutlineInputBorder(),
                     hintText: tr(
                       'ui.userfront.profile.phone.code_hint',
-                      fallback: '인증번호 6자리',
                     ),
                   ),
                 ),
@@ -870,7 +868,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
               const SizedBox(width: 8),
               ElevatedButton(
                 onPressed: _isVerifying ? null : () => _verifyCode(profile),
-                child: Text(tr('ui.common.confirm', fallback: '확인')),
+                child: Text(tr('ui.common.confirm')),
               ),
             ],
           ),
@@ -881,7 +879,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             child: Text(
               tr(
                 'msg.userfront.profile.phone.verify_notice',
-                fallback: '휴대폰 번호를 변경하려면 SMS 인증이 필요합니다.',
               ),
               style: const TextStyle(color: Colors.orange, fontSize: 12),
             ),
@@ -896,14 +893,13 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
-            tr('ui.userfront.profile.password.title', fallback: '비밀번호 변경'),
+            tr('ui.userfront.profile.password.title'),
             style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w700),
           ),
           const SizedBox(height: 8),
           Text(
             tr(
               'msg.userfront.profile.password.subtitle',
-              fallback: '현재 비밀번호 확인 후 새 비밀번호로 변경합니다.',
             ),
             style: const TextStyle(color: Color(0xFF6B7280)),
           ),
@@ -914,11 +910,14 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             decoration: InputDecoration(
               labelText: tr(
                 'ui.userfront.profile.password.current',
-                fallback: '현재 비밀번호',
               ),
               border: const OutlineInputBorder(),
               suffixIcon: IconButton(
-                icon: Icon(_showCurrentPassword ? Icons.visibility_off : Icons.visibility),
+                icon: Icon(
+                  _showCurrentPassword
+                      ? Icons.visibility_off
+                      : Icons.visibility,
+                ),
                 onPressed: () => setState(() {
                   _showCurrentPassword = !_showCurrentPassword;
                 }),
@@ -932,11 +931,12 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             decoration: InputDecoration(
               labelText: tr(
                 'ui.userfront.profile.password.new',
-                fallback: '새 비밀번호',
               ),
               border: const OutlineInputBorder(),
               suffixIcon: IconButton(
-                icon: Icon(_showNewPassword ? Icons.visibility_off : Icons.visibility),
+                icon: Icon(
+                  _showNewPassword ? Icons.visibility_off : Icons.visibility,
+                ),
                 onPressed: () => setState(() {
                   _showNewPassword = !_showNewPassword;
                 }),
@@ -950,11 +950,14 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
             decoration: InputDecoration(
               labelText: tr(
                 'ui.userfront.profile.password.confirm',
-                fallback: '새 비밀번호 확인',
               ),
               border: const OutlineInputBorder(),
               suffixIcon: IconButton(
-                icon: Icon(_showConfirmPassword ? Icons.visibility_off : Icons.visibility),
+                icon: Icon(
+                  _showConfirmPassword
+                      ? Icons.visibility_off
+                      : Icons.visibility,
+                ),
                 onPressed: () => setState(() {
                   _showConfirmPassword = !_showConfirmPassword;
                 }),
@@ -963,10 +966,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
           ),
           if (_passwordError != null) ...[
             const SizedBox(height: 12),
-            Text(
-              _passwordError!,
-              style: const TextStyle(color: Colors.red),
-            ),
+            Text(_passwordError!, style: const TextStyle(color: Colors.red)),
           ],
           if (_passwordSuccess != null) ...[
             const SizedBox(height: 12),
@@ -989,7 +989,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                     : Text(
                         tr(
                           'ui.userfront.profile.password.change',
-                          fallback: '비밀번호 변경',
                         ),
                       ),
               ),
@@ -999,7 +998,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                 child: Text(
                   tr(
                     'ui.userfront.profile.password.forgot',
-                    fallback: '비밀번호를 잊으셨나요?',
                   ),
                 ),
               ),
@@ -1025,10 +1023,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                   _buildHeaderCard(profile),
                   const SizedBox(height: 28),
                   _buildSectionTitle(
-                    tr('ui.userfront.profile.section.basic', fallback: '기본 정보'),
+                    tr('ui.userfront.profile.section.basic'),
                     tr(
                       'msg.userfront.profile.section.basic',
-                      fallback: '계정 기본 정보를 관리합니다.',
                     ),
                   ),
                   const SizedBox(height: 12),
@@ -1037,7 +1034,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                       children: [
                         _buildEditableTile(
                           field: 'name',
-                          label: tr('ui.userfront.profile.field.name', fallback: '이름'),
+                          label: tr(
+                            'ui.userfront.profile.field.name',
+                          ),
                           value: profile.name,
                           profile: profile,
                           isUpdating: isUpdating,
@@ -1045,7 +1044,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                         ),
                         const Divider(height: 24),
                         _buildReadOnlyTile(
-                          tr('ui.userfront.profile.field.email', fallback: '이메일'),
+                          tr(
+                            'ui.userfront.profile.field.email',
+                          ),
                           profile.email,
                         ),
                         const Divider(height: 24),
@@ -1055,10 +1056,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                   ),
                   const SizedBox(height: 28),
                   _buildSectionTitle(
-                    tr('ui.userfront.profile.section.organization', fallback: '조직 정보'),
+                    tr(
+                      'ui.userfront.profile.section.organization',
+                    ),
                     tr(
                       'msg.userfront.profile.section.organization',
-                      fallback: '소속 및 구분 정보입니다.',
                     ),
                   ),
                   const SizedBox(height: 12),
@@ -1067,7 +1069,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                       children: [
                         _buildEditableTile(
                           field: 'department',
-                          label: tr('ui.userfront.profile.field.department', fallback: '소속'),
+                          label: tr(
+                            'ui.userfront.profile.field.department',
+                          ),
                           value: profile.department,
                           profile: profile,
                           isUpdating: isUpdating,
@@ -1075,7 +1079,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                         ),
                         const Divider(height: 24),
                         _buildReadOnlyTile(
-                          tr('ui.userfront.profile.field.affiliation', fallback: '구분'),
+                          tr(
+                            'ui.userfront.profile.field.affiliation',
+                          ),
                           profile.affiliationType,
                         ),
                         if (profile.tenant != null) ...[
@@ -1083,7 +1089,6 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                           _buildReadOnlyTile(
                             tr(
                               'ui.userfront.profile.field.tenant',
-                              fallback: '소속 테넌트',
                             ),
                             profile.tenant!.name,
                           ),
@@ -1091,7 +1096,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                         if (profile.companyCode.isNotEmpty) ...[
                           const Divider(height: 24),
                           _buildReadOnlyTile(
-                            tr('ui.userfront.profile.field.company_code', fallback: '회사코드'),
+                            tr(
+                              'ui.userfront.profile.field.company_code',
+                            ),
                             profile.companyCode,
                           ),
                         ],
@@ -1100,10 +1107,9 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                   ),
                   const SizedBox(height: 28),
                   _buildSectionTitle(
-                    tr('ui.userfront.profile.section.security', fallback: '보안'),
+                    tr('ui.userfront.profile.section.security'),
                     tr(
                       'msg.userfront.profile.section.security',
-                      fallback: '비밀번호를 안전하게 관리합니다.',
                     ),
                   ),
                   const SizedBox(height: 12),
@@ -1132,7 +1138,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
     if (profile == null) {
       return Scaffold(
         appBar: AppBar(
-          title: Text(tr('ui.userfront.nav.profile', fallback: '내 정보')),
+          title: Text(tr('ui.userfront.nav.profile')),
         ),
         body: profileState.isLoading
             ? const Center(child: CircularProgressIndicator())
@@ -1143,13 +1149,13 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
                     Text(
                       tr(
                         'msg.userfront.profile.load_failed',
-                        fallback: '정보를 불러올 수 없습니다.',
                       ),
                     ),
                     const SizedBox(height: 16),
                     ElevatedButton(
-                      onPressed: () => ref.read(profileProvider.notifier).loadProfile(),
-                      child: Text(tr('ui.common.retry', fallback: '재시도')),
+                      onPressed: () =>
+                          ref.read(profileProvider.notifier).loadProfile(),
+                      child: Text(tr('ui.common.retry')),
                     ),
                   ],
                 ),
@@ -1166,7 +1172,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       backgroundColor: _subtle,
       appBar: AppBar(
         title: Text(
-          tr('ui.userfront.app_title', fallback: 'Baron 로그인'),
+          tr('ui.userfront.app_title'),
           style: const TextStyle(fontWeight: FontWeight.bold),
         ),
         elevation: 0,
@@ -1175,17 +1181,17 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         actions: [
           IconButton(
             icon: const Icon(Icons.home_outlined),
-            tooltip: tr('ui.userfront.nav.dashboard', fallback: '대시보드'),
+            tooltip: tr('ui.userfront.nav.dashboard'),
             onPressed: () => context.go('/'),
           ),
           IconButton(
             icon: const Icon(Icons.qr_code_scanner),
-            tooltip: tr('ui.userfront.nav.qr_scan', fallback: 'QR 스캔'),
+            tooltip: tr('ui.userfront.nav.qr_scan'),
             onPressed: () => context.push('/scan'),
           ),
           IconButton(
             icon: const Icon(Icons.logout),
-            tooltip: tr('ui.userfront.nav.logout', fallback: '로그아웃'),
+            tooltip: tr('ui.userfront.nav.logout'),
             onPressed: _logout,
           ),
         ],
@@ -1193,11 +1199,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
       drawer: isWide ? null : Drawer(child: _buildSideMenu(context)),
       body: Row(
         children: [
-          if (isWide)
-            SizedBox(
-              width: 240,
-              child: _buildSideMenu(context),
-            ),
+          if (isWide) SizedBox(width: 240, child: _buildSideMenu(context)),
           Expanded(child: _buildContent(profile, isUpdating)),
         ],
       ),
diff --git a/userfront/lib/i18n.dart b/userfront/lib/i18n.dart
index 9343c1e1..4a0f305e 100644
--- a/userfront/lib/i18n.dart
+++ b/userfront/lib/i18n.dart
@@ -1,40 +1,18 @@
-import 'dart:ui';
+import 'package:easy_localization/easy_localization.dart';
 
-import 'i18n_data.dart';
+final _koreanPattern = RegExp(r'[가-힣]');
 
-const _defaultLocale = 'ko';
-const _supportedLocales = ['ko', 'en'];
-
-String _resolveLocale() {
-  final locale = PlatformDispatcher.instance.locale;
-  final code = locale.languageCode.toLowerCase();
-  if (_supportedLocales.contains(code)) {
-    return code;
+String tr(String key, {String? fallback, Map<String, String>? params}) {
+  try {
+    if (fallback != null && _koreanPattern.hasMatch(fallback)) {
+      fallback = null;
+    }
+    final translated = key.tr(namedArgs: params);
+    if (translated == key && fallback != null && fallback.isNotEmpty) {
+      return fallback;
+    }
+    return translated;
+  } catch (_) {
+    return fallback ?? key;
   }
-  return _defaultLocale;
-}
-
-String _formatTemplate(String template, Map<String, String>? params) {
-  if (params == null || params.isEmpty) {
-    return template;
-  }
-  var result = template;
-  params.forEach((key, value) {
-    result = result.replaceAll('{{$key}}', value);
-  });
-  return result;
-}
-
-String tr(
-  String key, {
-  String? fallback,
-  Map<String, String>? params,
-}) {
-  final locale = _resolveLocale();
-  final map = locale == 'en' ? enStrings : koStrings;
-  final value = map[key];
-  final template = (value != null && value.isNotEmpty)
-      ? value
-      : (fallback ?? key);
-  return _formatTemplate(template, params);
 }
diff --git a/userfront/lib/main.dart b/userfront/lib/main.dart
index 5c94c1b1..7b9eca2d 100644
--- a/userfront/lib/main.dart
+++ b/userfront/lib/main.dart
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:easy_localization/easy_localization.dart' hide tr;
 import 'package:go_router/go_router.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
@@ -19,6 +20,9 @@ import 'core/services/auth_proxy_service.dart';
 import 'core/services/auth_token_store.dart';
 import 'core/services/logger_service.dart';
 import 'core/notifiers/auth_notifier.dart';
+import 'core/i18n/locale_gate.dart';
+import 'core/i18n/locale_utils.dart';
+import 'core/i18n/toml_asset_loader.dart';
 import 'package:logging/logging.dart';
 import 'features/auth/presentation/consent_screen.dart';
 import 'i18n.dart';
@@ -40,13 +44,16 @@ Future<void> _loadBundledFonts() async {
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   usePathUrlStrategy();
+  await EasyLocalization.ensureInitialized();
 
   // 1. Global Error Handling
   FlutterError.onError = (details) {
     FlutterError.presentError(details);
     _log.severe("FLUTTER_ERROR", details.exception, details.stack);
     // Also send to backend if needed
-    AuthProxyService.logError("FLUTTER_ERROR: ${details.exception}\n${details.stack}");
+    AuthProxyService.logError(
+      "FLUTTER_ERROR: ${details.exception}\n${details.stack}",
+    );
   };
 
   PlatformDispatcher.instance.onError = (error, stack) {
@@ -68,7 +75,22 @@ void main() async {
   // 폰트를 먼저 로딩해서 렌더링 깨짐(FOIT/FOUT) 최소화
   await _loadBundledFonts();
 
-  runApp(const ProviderScope(child: BaronSSOApp()));
+  runApp(
+    // URL(/en, /ko)이 있으면 우선 적용해서 첫 렌더부터 올바른 언어로 시작합니다.
+    () {
+      final initialLocaleCode =
+          extractLocaleFromPath(Uri.base) ?? resolvePreferredLocaleCode();
+      return EasyLocalization(
+        supportedLocales: const [Locale('en'), Locale('ko')],
+        fallbackLocale: const Locale('en'),
+        startLocale: Locale(initialLocaleCode),
+        saveLocale: false,
+        path: 'assets/translations',
+        assetLoader: const TomlAssetLoader(),
+        child: const ProviderScope(child: BaronSSOApp()),
+      );
+    }(),
+  );
 }
 
 // Router Configuration
@@ -79,190 +101,227 @@ final _router = GoRouter(
   debugLogDiagnostics: !kReleaseMode,
   refreshListenable: AuthNotifier.instance,
   routes: [
-    GoRoute(
-      path: '/',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to root (DashboardScreen)");
-        return const DashboardScreen();
-      },
-    ),
-    GoRoute(
-      path: '/profile',
-      builder: (context, state) => const ProfilePage(),
-    ),
-    GoRoute(
-      path: '/signin',
-      builder: (context, state) {
-        final loginChallenge = state.uri.queryParameters['login_challenge'];
-        _routerLogger.info("Navigating to /signin with login_challenge: $loginChallenge");
-        return LoginScreen(key: state.pageKey, loginChallenge: loginChallenge);
-      },
-    ),
-    GoRoute(
-      path: '/login',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /login");
-        return LoginScreen(key: state.pageKey);
-      },
-    ),
-    GoRoute(
-      path: '/consent',
-      builder: (BuildContext context, GoRouterState state) {
-        final consentChallenge = state.uri.queryParameters['consent_challenge'];
-        if (consentChallenge == null) {
-          _routerLogger.warning("Consent screen loaded without a challenge.");
-          return const Scaffold(body: Center(child: Text('Error: Consent challenge is missing.')));
-        }
-        _routerLogger.info("Navigating to /consent with challenge.");
-        return ConsentScreen(consentChallenge: consentChallenge);
-      },
-    ),
-    GoRoute(
-      path: '/signup',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /signup");
-        return const SignupScreen();
-      },
-    ),
-    GoRoute(
-      path: '/registration',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /registration");
-        return const SignupScreen();
-      },
-    ),
-    GoRoute(
-      path: '/verify',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /verify (query)");
-        return LoginScreen(key: state.pageKey);
-      },
-    ),
-    GoRoute(
-      path: '/verify/:token',
-      builder: (context, state) {
-        final token = state.pathParameters['token'];
-        _routerLogger.info("Navigating to /verify with token: $token");
-        return LoginScreen(key: state.pageKey, verificationToken: token);
-      },
-    ),
-    GoRoute(
-      path: '/verification',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /verification");
-        return LoginScreen(key: state.pageKey);
-      },
-    ),
-    GoRoute(
-      path: '/l/:shortCode',
-      builder: (context, state) {
-        final shortCode = state.pathParameters['shortCode'];
-        _routerLogger.info("Navigating to /l with code: $shortCode");
-        return LoginScreen(key: state.pageKey);
-      },
-    ),
-    GoRoute(
-      path: '/forgot-password',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /forgot-password");
-        return const ForgotPasswordScreen();
-      },
-    ),
-    GoRoute(
-      path: '/recovery',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /recovery");
-        return const ForgotPasswordScreen();
-      },
-    ),
-    GoRoute(
-      // Supports both /reset-password and /reset-password?token=...
-      path: '/reset-password',
-      builder: (context, state) {
-        // For deep linking, you might pass the token in the path, e.g., /reset-password/:token
-        // final token = state.pathParameters['token'];
-        _routerLogger.info("Navigating to /reset-password");
-        return const ResetPasswordScreen();
-      },
-    ),
-    GoRoute(
-      path: '/error',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /error");
-        final params = state.uri.queryParameters;
-        return ErrorScreen(
-          errorId: params['id'],
-          errorCode: params['error'],
-          description: params['error_description'] ?? params['message'],
-        );
-      },
-    ),
-    GoRoute(
-      path: '/settings',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /settings (disabled)");
-        return ErrorScreen(
-          errorCode: 'settings_disabled',
-          description: tr(
-            'msg.userfront.settings.disabled',
-            fallback: '현재 계정 설정 화면은 준비 중입니다.',
-          ),
-        );
-      },
-    ),
-    GoRoute(
-      path: '/approve',
-      builder: (context, state) {
-        final ref = state.uri.queryParameters['ref'];
-        _routerLogger.info("Navigating to /approve with ref: $ref");
-        return ApproveQrScreen(pendingRef: ref);
-      },
-    ),
-    GoRoute(
-      path: '/ql/:ref',
-      builder: (context, state) {
-        final ref = state.pathParameters['ref'];
-        _routerLogger.info("Navigating to /ql with ref: $ref");
-        return ApproveQrScreen(pendingRef: ref);
-      },
-    ),
-    GoRoute(
-      path: '/scan',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /scan");
-        return const QRScanScreen();
-      },
-    ),
-    GoRoute(
-      path: '/admin/users',
-      builder: (context, state) {
-        _routerLogger.info("Navigating to /admin/users");
-        return const UserManagementScreen();
+    ShellRoute(
+      builder: (context, state, child) {
+        final localeCode =
+            extractLocaleFromPath(state.uri) ?? resolvePreferredLocaleCode();
+        return LocaleGate(localeCode: localeCode, child: child);
       },
+      routes: [
+        GoRoute(
+          path: '/:locale',
+          builder: (context, state) {
+            _routerLogger.info("Navigating to root (DashboardScreen)");
+            return const DashboardScreen();
+          },
+          routes: [
+            GoRoute(
+              path: 'profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
+            GoRoute(
+              path: 'signin',
+              builder: (context, state) {
+                final loginChallenge =
+                    state.uri.queryParameters['login_challenge'];
+                final redirectUrl =
+                    state.uri.queryParameters['redirect_uri'] ??
+                    state.uri.queryParameters['redirect_url'];
+                _routerLogger.info(
+                  "Navigating to /signin with login_challenge: $loginChallenge, redirect: $redirectUrl",
+                );
+                return LoginScreen(
+                  key: state.pageKey,
+                  loginChallenge: loginChallenge,
+                  redirectUrl: redirectUrl,
+                );
+              },
+            ),
+            GoRoute(
+              path: 'login',
+              builder: (context, state) {
+                final redirectUrl =
+                    state.uri.queryParameters['redirect_uri'] ??
+                    state.uri.queryParameters['redirect_url'];
+                _routerLogger.info("Navigating to /login, redirect: $redirectUrl");
+                return LoginScreen(key: state.pageKey, redirectUrl: redirectUrl);
+              },
+            ),
+            GoRoute(
+              path: 'consent',
+              builder: (BuildContext context, GoRouterState state) {
+                final consentChallenge =
+                    state.uri.queryParameters['consent_challenge'];
+                if (consentChallenge == null) {
+                  _routerLogger.warning("Consent screen loaded without a challenge.");
+                  return const Scaffold(
+                    body: Center(
+                      child: Text('Error: Consent challenge is missing.'),
+                    ),
+                  );
+                }
+                _routerLogger.info("Navigating to /consent with challenge.");
+                return ConsentScreen(consentChallenge: consentChallenge);
+              },
+            ),
+            GoRoute(
+              path: 'signup',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /signup");
+                return const SignupScreen();
+              },
+            ),
+            GoRoute(
+              path: 'registration',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /registration");
+                return const SignupScreen();
+              },
+            ),
+            GoRoute(
+              path: 'verify',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /verify (query)");
+                return LoginScreen(key: state.pageKey);
+              },
+            ),
+            GoRoute(
+              path: 'verify/:token',
+              builder: (context, state) {
+                final token = state.pathParameters['token'];
+                _routerLogger.info("Navigating to /verify with token: $token");
+                return LoginScreen(
+                  key: state.pageKey,
+                  verificationToken: token,
+                );
+              },
+            ),
+            GoRoute(
+              path: 'verification',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /verification");
+                return LoginScreen(key: state.pageKey);
+              },
+            ),
+            GoRoute(
+              path: 'l/:shortCode',
+              builder: (context, state) {
+                final shortCode = state.pathParameters['shortCode'];
+                _routerLogger.info("Navigating to /l with code: $shortCode");
+                return LoginScreen(key: state.pageKey);
+              },
+            ),
+            GoRoute(
+              path: 'forgot-password',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /forgot-password");
+                return const ForgotPasswordScreen();
+              },
+            ),
+            GoRoute(
+              path: 'recovery',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /recovery");
+                return const ForgotPasswordScreen();
+              },
+            ),
+            GoRoute(
+              // Supports both /reset-password and /reset-password?token=...
+              path: 'reset-password',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /reset-password");
+                return const ResetPasswordScreen();
+              },
+            ),
+            GoRoute(
+              path: 'error',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /error");
+                final params = state.uri.queryParameters;
+                return ErrorScreen(
+                  errorId: params['id'],
+                  errorCode: params['error'],
+                  description:
+                      params['error_description'] ?? params['message'],
+                );
+              },
+            ),
+            GoRoute(
+              path: 'settings',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /settings (disabled)");
+                return ErrorScreen(
+                  errorCode: 'settings_disabled',
+                  description: tr(
+                    'msg.userfront.settings.disabled',
+                  ),
+                );
+              },
+            ),
+            GoRoute(
+              path: 'approve',
+              builder: (context, state) {
+                final ref = state.uri.queryParameters['ref'];
+                _routerLogger.info("Navigating to /approve with ref: $ref");
+                return ApproveQrScreen(pendingRef: ref);
+              },
+            ),
+            GoRoute(
+              path: 'ql/:ref',
+              builder: (context, state) {
+                final ref = state.pathParameters['ref'];
+                _routerLogger.info("Navigating to /ql with ref: $ref");
+                return ApproveQrScreen(pendingRef: ref);
+              },
+            ),
+            GoRoute(
+              path: 'scan',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /scan");
+                return const QRScanScreen();
+              },
+            ),
+            GoRoute(
+              path: 'admin/users',
+              builder: (context, state) {
+                _routerLogger.info("Navigating to /admin/users");
+                return const UserManagementScreen();
+              },
+            ),
+          ],
+        ),
+      ],
     ),
   ],
   redirect: (context, state) {
+    final requestedLocale = extractLocaleFromPath(state.uri);
+    final preferredLocale = resolvePreferredLocaleCode();
+    if (requestedLocale == null) {
+      return buildLocalizedPath(preferredLocale, state.uri);
+    }
+
     final hasStoredToken = AuthTokenStore.getToken() != null;
     final hasCookieSession = AuthTokenStore.usesCookie();
     final isLoggedIn = hasStoredToken || hasCookieSession;
-    final path = state.uri.path;
+    final path = stripLocalePath(state.uri);
 
     // Public paths that don't require login
-    final isPublicPath = path == '/signin' ||
-                         path == '/signup' ||
-                         path == '/login' ||
-                         path == '/registration' ||
-                         path == '/verify' ||
-                         path == '/verification' ||
-                         path.startsWith('/verify/') ||
-                         path == '/approve' ||
-                         path.startsWith('/ql/') ||
-                         path == '/forgot-password' ||
-                         path == '/recovery' ||
-                         path == '/reset-password' ||
-                         path == '/error' ||
-                         path == '/settings' ||
-                         path == '/consent'; // Consent page is public
+    final isPublicPath =
+        path == '/signin' ||
+        path == '/signup' ||
+        path == '/login' ||
+        path == '/registration' ||
+        path == '/verify' ||
+        path == '/verification' ||
+        path.startsWith('/verify/') ||
+        path == '/approve' ||
+        path.startsWith('/ql/') ||
+        path == '/forgot-password' ||
+        path == '/recovery' ||
+        path == '/reset-password' ||
+        path == '/error' ||
+        path == '/settings' ||
+        path == '/consent'; // Consent page is public
 
     _routerLogger.fine("Redirect check - Path: $path, IsLoggedIn: $isLoggedIn");
 
@@ -273,13 +332,14 @@ final _router = GoRouter(
 
     // If not logged in and trying to access a protected page, redirect to /signin
     if (!isLoggedIn) {
-       _routerLogger.info("Not logged in, redirecting to /signin");
+      _routerLogger.info("Not logged in, redirecting to /signin");
       // Preserve OIDC challenge if present
       final loginChallenge = state.uri.queryParameters['login_challenge'];
+      final locale = requestedLocale;
       if (loginChallenge != null) {
-        return '/signin?login_challenge=$loginChallenge';
+        return '/$locale/signin?login_challenge=$loginChallenge';
       }
-      return '/signin';
+      return '/$locale/signin';
     }
 
     // If logged in and trying to access login page, redirect to root (dashboard)
@@ -299,7 +359,10 @@ class BaronSSOApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp.router(
-      title: tr('ui.userfront.app_title', fallback: 'Baron 로그인'),
+      title: tr('ui.userfront.app_title'),
+      localizationsDelegates: context.localizationDelegates,
+      supportedLocales: context.supportedLocales,
+      locale: context.locale,
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(
           seedColor: const Color(0xFF1A1F2C), // Dark Navy/Black base
diff --git a/userfront/pubspec.lock b/userfront/pubspec.lock
index 9830d941..30273623 100644
--- a/userfront/pubspec.lock
+++ b/userfront/pubspec.lock
@@ -105,6 +105,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  easy_localization:
+    dependency: "direct main"
+    description:
+      name: easy_localization
+      sha256: "2ccdf9db8fe4d9c5a75c122e6275674508fd0f0d49c827354967b8afcc56bbed"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.8"
+  easy_logger:
+    dependency: transitive
+    description:
+      name: easy_logger
+      sha256: c764a6e024846f33405a2342caf91c62e357c24b02c04dbc712ef232bf30ffb7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.2"
   fake_async:
     dependency: transitive
     description:
@@ -113,6 +129,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.3"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
   file:
     dependency: transitive
     description:
@@ -134,6 +158,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -142,6 +171,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_localizations:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_riverpod:
     dependency: "direct main"
     description:
@@ -168,6 +202,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   glob:
     dependency: transitive
     description:
@@ -208,6 +247,19 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.2"
   io:
     dependency: transitive
     description:
@@ -336,6 +388,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -352,6 +444,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.2"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.5"
   pub_semver:
     dependency: transitive
     description:
@@ -384,6 +484,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
+  shared_preferences:
+    dependency: transitive
+    description:
+      name: shared_preferences
+      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.20"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -477,6 +633,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   term_glyph:
     dependency: transitive
     description:
@@ -509,6 +673,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.12"
+  toml:
+    dependency: "direct main"
+    description:
+      name: toml
+      sha256: "9968de24e45b632bf1a654fe1ac7b6fe5261c349243df83fd262397799c45a2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.0"
   typed_data:
     dependency: transitive
     description:
@@ -629,6 +801,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -637,6 +817,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
@@ -646,5 +834,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.10.4 <4.0.0"
+  dart: ">=3.10.0 <4.0.0"
   flutter: ">=3.38.0"
diff --git a/userfront/pubspec.yaml b/userfront/pubspec.yaml
index b2e0e950..6f8e3775 100644
--- a/userfront/pubspec.yaml
+++ b/userfront/pubspec.yaml
@@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-    sdk: ^3.10.4
+    sdk: ">=3.10.0-0 <4.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -45,10 +45,14 @@ dependencies:
     logger: ^2.0.0
     qr_flutter: ^4.1.0
     mobile_scanner: ^7.1.4
+    easy_localization: ^3.0.7
+    toml: ^0.15.0
 
 dev_dependencies:
     flutter_test:
         sdk: flutter
+    integration_test:
+        sdk: flutter
 
     # The "flutter_lints" package below contains a set of recommended lints to
     # encourage good coding practices. The lint set provided by the package is
@@ -70,6 +74,8 @@ flutter:
     # To add assets to your application, add an assets section, like this:
     # assets:
     #   - .env
+    assets:
+        - assets/translations/
 
     # An image asset can refer to one or more resolution-specific "variants", see
     # https://flutter.dev/to/resolution-aware-images
diff --git a/userfront/test/helpers/web_storage.dart b/userfront/test/helpers/web_storage.dart
new file mode 100644
index 00000000..6d2e3c99
--- /dev/null
+++ b/userfront/test/helpers/web_storage.dart
@@ -0,0 +1,5 @@
+import 'web_storage_stub.dart'
+    if (dart.library.html) 'web_storage_web.dart';
+
+export 'web_storage_stub.dart'
+    if (dart.library.html) 'web_storage_web.dart';
diff --git a/userfront/test/helpers/web_storage_stub.dart b/userfront/test/helpers/web_storage_stub.dart
new file mode 100644
index 00000000..99d1770e
--- /dev/null
+++ b/userfront/test/helpers/web_storage_stub.dart
@@ -0,0 +1,21 @@
+class WebStorage {
+  bool get isWeb => false;
+
+  String? get(String key) => null;
+
+  void set(String key, String value) {}
+
+  String? getSession(String key) => null;
+
+  void setSession(String key, String value) {}
+
+  void removeSession(String key) {}
+
+  void clearSession() {}
+
+  void remove(String key) {}
+
+  void clear() {}
+}
+
+final webStorage = WebStorage();
diff --git a/userfront/test/helpers/web_storage_web.dart b/userfront/test/helpers/web_storage_web.dart
new file mode 100644
index 00000000..b9bbc1b8
--- /dev/null
+++ b/userfront/test/helpers/web_storage_web.dart
@@ -0,0 +1,37 @@
+// ignore_for_file: avoid_web_libraries_in_flutter
+
+import 'dart:html' as html;
+
+class WebStorage {
+  bool get isWeb => true;
+
+  String? get(String key) => html.window.localStorage[key];
+
+  void set(String key, String value) {
+    html.window.localStorage[key] = value;
+  }
+
+  String? getSession(String key) => html.window.sessionStorage[key];
+
+  void setSession(String key, String value) {
+    html.window.sessionStorage[key] = value;
+  }
+
+  void removeSession(String key) {
+    html.window.sessionStorage.remove(key);
+  }
+
+  void clearSession() {
+    html.window.sessionStorage.clear();
+  }
+
+  void remove(String key) {
+    html.window.localStorage.remove(key);
+  }
+
+  void clear() {
+    html.window.localStorage.clear();
+  }
+}
+
+final webStorage = WebStorage();
diff --git a/userfront/test/locale_storage_web_test.dart b/userfront/test/locale_storage_web_test.dart
new file mode 100644
index 00000000..a43c8de8
--- /dev/null
+++ b/userfront/test/locale_storage_web_test.dart
@@ -0,0 +1,88 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:userfront/core/i18n/locale_storage.dart';
+import 'package:userfront/core/i18n/locale_storage_web.dart' as locale_web;
+
+import 'helpers/web_storage.dart';
+
+void main() {
+  setUp(() {
+    locale_web.LocaleStorageImpl.forceMemoryStorageForTests(false);
+    locale_web.LocaleStorageImpl.forceSessionStorageForTests(false);
+    if (webStorage.isWeb) {
+      webStorage.clear();
+      webStorage.clearSession();
+    }
+  });
+
+  tearDown(() {
+    locale_web.LocaleStorageImpl.forceMemoryStorageForTests(false);
+    locale_web.LocaleStorageImpl.forceSessionStorageForTests(false);
+    if (webStorage.isWeb) {
+      webStorage.clear();
+      webStorage.clearSession();
+    }
+  });
+
+  test(
+    'localStorage write/read (웹)',
+    () {
+      if (!webStorage.isWeb) {
+        return;
+      }
+
+      LocaleStorage.write('ko');
+      expect(webStorage.get('locale'), 'ko');
+      expect(LocaleStorage.read(), 'ko');
+    },
+    skip: !webStorage.isWeb,
+  );
+
+  test(
+    'legacy key에서 locale로 마이그레이션 (웹)',
+    () {
+      if (!webStorage.isWeb) {
+        return;
+      }
+
+      webStorage.set('baron_locale', 'en');
+      expect(LocaleStorage.read(), 'en');
+      expect(webStorage.get('locale'), 'en');
+      expect(webStorage.get('baron_locale'), isNull);
+    },
+    skip: !webStorage.isWeb,
+  );
+
+  test(
+    'localStorage 접근이 차단되면 메모리 fallback (웹)',
+    () {
+      if (!webStorage.isWeb) {
+        return;
+      }
+
+      locale_web.LocaleStorageImpl.forceMemoryStorageForTests(true);
+
+      LocaleStorage.write('en');
+      expect(webStorage.get('locale'), isNull);
+      expect(webStorage.getSession('locale'), isNull);
+      expect(LocaleStorage.read(), 'en');
+    },
+    skip: !webStorage.isWeb,
+  );
+
+  test(
+    'localStorage 접근이 차단되면 sessionStorage로 fallback (웹)',
+    () {
+      if (!webStorage.isWeb) {
+        return;
+      }
+
+      locale_web.LocaleStorageImpl.forceSessionStorageForTests(true);
+
+      LocaleStorage.write('ko');
+      expect(webStorage.get('locale'), isNull);
+      expect(webStorage.getSession('locale'), 'ko');
+      expect(LocaleStorage.read(), 'ko');
+    },
+    skip: !webStorage.isWeb,
+  );
+}
diff --git a/userfront/test/locale_utils_test.dart b/userfront/test/locale_utils_test.dart
new file mode 100644
index 00000000..6b16ebdf
--- /dev/null
+++ b/userfront/test/locale_utils_test.dart
@@ -0,0 +1,66 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:userfront/core/i18n/locale_utils.dart';
+
+void main() {
+  group('locale_utils', () {
+    test('normalizeLocaleCode handles supported locales', () {
+      expect(normalizeLocaleCode('ko'), 'ko');
+      expect(normalizeLocaleCode('ko-KR'), 'ko');
+      expect(normalizeLocaleCode('en'), 'en');
+      expect(normalizeLocaleCode('en-US'), 'en');
+    });
+
+    test('normalizeLocaleCode falls back to default', () {
+      expect(normalizeLocaleCode('ja'), defaultLocaleCode);
+      expect(normalizeLocaleCode(null), defaultLocaleCode);
+      expect(normalizeLocaleCode(''), defaultLocaleCode);
+    });
+
+    test('extractLocaleFromPath picks locale when present', () {
+      expect(extractLocaleFromPath(Uri.parse('/ko/signin')), 'ko');
+      expect(extractLocaleFromPath(Uri.parse('/en/profile')), 'en');
+      expect(extractLocaleFromPath(Uri.parse('/ko')), 'ko');
+    });
+
+    test('extractLocaleFromPath returns null when missing', () {
+      expect(extractLocaleFromPath(Uri.parse('/signin')), isNull);
+      expect(extractLocaleFromPath(Uri.parse('/zz/signin')), isNull);
+    });
+
+    test('stripLocalePath removes locale segment', () {
+      expect(stripLocalePath(Uri.parse('/ko/signin')), '/signin');
+      expect(stripLocalePath(Uri.parse('/en/profile')), '/profile');
+      expect(stripLocalePath(Uri.parse('/ko')), '/');
+      expect(stripLocalePath(Uri.parse('/en/')), '/');
+    });
+
+    test('stripLocalePath keeps path without locale', () {
+      expect(stripLocalePath(Uri.parse('/signin')), '/signin');
+      expect(stripLocalePath(Uri.parse('/auth/callback')), '/auth/callback');
+    });
+
+    test('buildLocalizedPath applies locale', () {
+      expect(buildLocalizedPath('ko', Uri.parse('/signin')), '/ko/signin');
+      expect(buildLocalizedPath('en', Uri.parse('/signin')), '/en/signin');
+      expect(buildLocalizedPath('ko', Uri.parse('/')), '/ko');
+      expect(buildLocalizedPath('en', Uri.parse('/')), '/en');
+    });
+
+    test('buildLocalizedPath preserves query parameters', () {
+      final uri = Uri.parse('/signin?redirect_uri=https://example.com');
+      expect(
+        buildLocalizedPath('ko', uri),
+        '/ko/signin?redirect_uri=https%3A%2F%2Fexample.com',
+      );
+    });
+
+    test('buildLocalizedPath replaces existing locale', () {
+      expect(buildLocalizedPath('en', Uri.parse('/ko/signin')), '/en/signin');
+      expect(buildLocalizedPath('ko', Uri.parse('/en/profile')), '/ko/profile');
+    });
+
+    test('buildLocalizedPath drops unknown 2-letter prefix', () {
+      expect(buildLocalizedPath('ko', Uri.parse('/zz/signin')), '/ko/signin');
+    });
+  });
+}
diff --git a/userfront/test/widget_test.dart b/userfront/test/widget_test.dart
index bef062e6..a598ae28 100644
--- a/userfront/test/widget_test.dart
+++ b/userfront/test/widget_test.dart
@@ -5,15 +5,36 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'dart:ui';
+
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'package:userfront/main.dart' show BaronSSOApp;
 
+class _TestAssetLoader extends AssetLoader {
+  const _TestAssetLoader();
+
+  @override
+  Future<Map<String, dynamic>> load(String path, Locale locale) async {
+    return {};
+  }
+}
+
 void main() {
   testWidgets('BaronSSOApp builds', (WidgetTester tester) async {
     // runApp에서 ProviderScope로 감싸서 쓰고 있으니 테스트도 동일하게 감쌈
-    await tester.pumpWidget(const ProviderScope(child: BaronSSOApp()));
+    await tester.pumpWidget(
+      EasyLocalization(
+        supportedLocales: const [Locale('en'), Locale('ko')],
+        fallbackLocale: const Locale('en'),
+        startLocale: const Locale('en'),
+        path: 'assets/translations',
+        assetLoader: const _TestAssetLoader(),
+        child: const ProviderScope(child: BaronSSOApp()),
+      ),
+    );
     await tester.pump(); // 한 프레임 더
   });
 }