diff --git a/TaxBaik.Admin/Services/CustomAuthenticationStateProvider.cs b/TaxBaik.Admin/Services/CustomAuthenticationStateProvider.cs
index 602a5c5..a059b9b 100644
--- a/TaxBaik.Admin/Services/CustomAuthenticationStateProvider.cs
+++ b/TaxBaik.Admin/Services/CustomAuthenticationStateProvider.cs
@@ -1,3 +1,4 @@
+using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 
@@ -27,6 +28,13 @@ public class CustomAuthenticationStateProvider : AuthenticationStateProvider
                 return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
             }
 
+            if (IsTokenExpired(token))
+            {
+                _logger.LogWarning("토큰 만료됨");
+                await _localStorage.RemoveItemAsync("auth_token");
+                return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
+            }
+
             var principal = _authService.ValidateToken(token);
             if (principal == null)
             {
@@ -46,8 +54,6 @@ public class CustomAuthenticationStateProvider : AuthenticationStateProvider
     public async Task LoginAsync(string token)
     {
         await _localStorage.SetItemAsStringAsync("auth_token", token);
-
-        var principal = _authService.ValidateToken(token);
         NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
     }
 
@@ -56,4 +62,18 @@ public class CustomAuthenticationStateProvider : AuthenticationStateProvider
         await _localStorage.RemoveItemAsync("auth_token");
         NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
     }
+
+    private bool IsTokenExpired(string token)
+    {
+        try
+        {
+            var handler = new JwtSecurityTokenHandler();
+            var jwtToken = handler.ReadJwtToken(token);
+            return jwtToken.ValidTo < DateTime.UtcNow;
+        }
+        catch
+        {
+            return true;
+        }
+    }
 }
diff --git a/TaxBaik.Admin/Shared/NavMenu.razor b/TaxBaik.Admin/Shared/NavMenu.razor
index 219e124..ddb2446 100644
--- a/TaxBaik.Admin/Shared/NavMenu.razor
+++ b/TaxBaik.Admin/Shared/NavMenu.razor
@@ -1,6 +1,26 @@
-<div class="top-row ps-3 navbar navbar-dark">
+@using System.Security.Claims
+@using Microsoft.AspNetCore.Components.Authorization
+@using TaxBaik.Admin.Services
+@inject AuthenticationStateProvider AuthStateProvider
+@inject CustomAuthenticationStateProvider CustomAuthStateProvider
+@inject NavigationManager NavigationManager
+
+<div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="">TaxBaik.Admin</a>
+        <div class="d-flex align-items-center gap-3 ms-auto">
+            <AuthorizeView>
+                <Authorized>
+                    <div class="user-info text-light">
+                        <span>@context.User.FindFirst(ClaimTypes.Name)?.Value</span>
+                        <button class="btn btn-sm btn-outline-light ms-2" @onclick="HandleLogout">로그아웃</button>
+                    </div>
+                </Authorized>
+                <NotAuthorized>
+                    <a href="login" class="btn btn-sm btn-outline-light">로그인</a>
+                </NotAuthorized>
+            </AuthorizeView>
+        </div>
         <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
             <span class="navbar-toggler-icon"></span>
         </button>
@@ -10,18 +30,18 @@
 <div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
     <nav class="flex-column">
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Home
+            <NavLink class="nav-link" href="dashboard" Match="NavLinkMatch.All">
+                <span class="oi oi-home" aria-hidden="true"></span> 대시보드
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
+            <NavLink class="nav-link" href="blog">
+                <span class="oi oi-document" aria-hidden="true"></span> 블로그
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
+            <NavLink class="nav-link" href="inquiries">
+                <span class="oi oi-envelope-closed" aria-hidden="true"></span> 문의사항
             </NavLink>
         </div>
     </nav>
@@ -36,4 +56,10 @@
     {
         collapseNavMenu = !collapseNavMenu;
     }
+
+    private async Task HandleLogout()
+    {
+        await CustomAuthStateProvider.LogoutAsync();
+        NavigationManager.NavigateTo("/login", forceLoad: true);
+    }
 }
diff --git a/TaxBaik.Admin/_Imports.razor b/TaxBaik.Admin/_Imports.razor
index e90de18..55bd65c 100644
--- a/TaxBaik.Admin/_Imports.razor
+++ b/TaxBaik.Admin/_Imports.razor
@@ -8,3 +8,4 @@
 @using Microsoft.JSInterop
 @using TaxBaik.Admin
 @using TaxBaik.Admin.Shared
+@using TaxBaik.Admin.Services