diff --git a/TaxBaik.Web/Components/Admin/App.razor b/TaxBaik.Web/Components/Admin/App.razor
index a689adf..2ecbf0e 100644
--- a/TaxBaik.Web/Components/Admin/App.razor
+++ b/TaxBaik.Web/Components/Admin/App.razor
@@ -32,6 +32,7 @@
         </div>
     </div>
     <MudThemeProvider @bind-IsDarkMode="isDarkMode" Theme="mudTheme" />
+    <MudPopoverProvider />
     <MudDialogProvider />
     <MudSnackbarProvider />
     <Routes @rendermode="new InteractiveServerRenderMode(prerender: false)" />
diff --git a/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor b/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor
index 9ea7afd..df47db0 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Announcements/AnnouncementList.razor
@@ -90,11 +90,25 @@
 </MudPaper>
 
 @code {
+    [CascadingParameter]
+    private Task<AuthenticationState>? AuthStateTask { get; set; }
+
     private List<Announcement>? announcements;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        await LoadAsync();
+        if (firstRender)
+        {
+            if (AuthStateTask != null)
+            {
+                var authState = await AuthStateTask;
+                if (authState.User.Identity?.IsAuthenticated == true)
+                {
+                    await LoadAsync();
+                    StateHasChanged();
+                }
+            }
+        }
     }
 
     private async Task LoadAsync()
diff --git a/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor b/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor
index 27d19e7..d8d982d 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Blog/BlogList.razor
@@ -50,6 +50,9 @@
 </MudStack>
 
 @code {
+    [CascadingParameter]
+    private Task<AuthenticationState>? AuthStateTask { get; set; }
+
     private List<TaxBaik.Domain.Entities.BlogPost> posts = [];
     private bool isLoading = true;
     private int currentPage = 1;
@@ -57,9 +60,20 @@
     private int totalPosts = 0;
     private const int PageSize = 20;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        await LoadPosts();
+        if (firstRender)
+        {
+            if (AuthStateTask != null)
+            {
+                var authState = await AuthStateTask;
+                if (authState.User.Identity?.IsAuthenticated == true)
+                {
+                    await LoadPosts();
+                    StateHasChanged();
+                }
+            }
+        }
     }
 
     private async Task LoadPosts()
diff --git a/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor b/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor
index c872440..790e06a 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Clients/ClientList.razor
@@ -129,6 +129,9 @@
 </MudPaper>
 
 @code {
+    [CascadingParameter]
+    private Task<AuthenticationState>? AuthStateTask { get; set; }
+
     private List<Client>? clients;
     private string searchText = "";
     private string statusFilter = "";
@@ -137,7 +140,21 @@
     private int totalPages;
     private const int PageSize = 20;
 
-    protected override async Task OnInitializedAsync() => await LoadAsync();
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            if (AuthStateTask != null)
+            {
+                var authState = await AuthStateTask;
+                if (authState.User.Identity?.IsAuthenticated == true)
+                {
+                    await LoadAsync();
+                    StateHasChanged();
+                }
+            }
+        }
+    }
 
     private async Task LoadAsync()
     {
diff --git a/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor b/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor
index 3df5d10..3442860 100644
--- a/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/ConsultingActivities.razor
@@ -103,7 +103,14 @@
                     <MudSelectItem Value="@client.Id">@client.CompanyName</MudSelectItem>
                 }
             </MudSelect>
-            <MudTextField T="string" @bind-Value="activityForm.ActivityType" Label="활동 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
+            <MudSelect T="string" @bind-Value="activityForm.ActivityType" Label="활동 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true">
+                <MudSelectItem Value="@("방문 상담")">방문 상담</MudSelectItem>
+                <MudSelectItem Value="@("전화 상담")">전화 상담</MudSelectItem>
+                <MudSelectItem Value="@("세무조사 대응 미팅")">세무조사 대응 미팅</MudSelectItem>
+                <MudSelectItem Value="@("카카오톡 상담")">카카오톡 상담</MudSelectItem>
+                <MudSelectItem Value="@("이메일 자료 접수")">이메일 자료 접수</MudSelectItem>
+                <MudSelectItem Value="@("기타")">기타</MudSelectItem>
+            </MudSelect>
             <MudDatePicker @bind-Date="activityForm.ActivityDate" Label="활동일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
             <MudTextField T="string" @bind-Value="activityForm.Description" Label="설명" Variant="Variant.Outlined" FullWidth="true" Lines="3" Class="mb-4" Required="true" />
             <MudDatePicker @bind-Date="activityForm.NextFollowupDate" Label="다음 팔로업일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" />
diff --git a/TaxBaik.Web/Components/Admin/Pages/Contracts.razor b/TaxBaik.Web/Components/Admin/Pages/Contracts.razor
index 2587a32..4b70578 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Contracts.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Contracts.razor
@@ -114,7 +114,14 @@
                 }
             </MudSelect>
             <MudTextField T="string" @bind-Value="contractForm.ContractNumber" Label="계약번호" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
-            <MudTextField T="string" @bind-Value="contractForm.ServiceType" Label="서비스 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
+            <MudSelect T="string" @bind-Value="contractForm.ServiceType" Label="서비스 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true">
+                <MudSelectItem Value="@("개인 기장대리")">개인 기장대리</MudSelectItem>
+                <MudSelectItem Value="@("법인 기장대리")">법인 기장대리</MudSelectItem>
+                <MudSelectItem Value="@("세무조정 대행")">세무조정 대행</MudSelectItem>
+                <MudSelectItem Value="@("양도세 신고대리")">양도세 신고대리</MudSelectItem>
+                <MudSelectItem Value="@("상속·증여 자문")">상속·증여 자문</MudSelectItem>
+                <MudSelectItem Value="@("세무조사 대응")">세무조사 대응</MudSelectItem>
+            </MudSelect>
             <MudDatePicker @bind-Date="contractForm.StartDate" Label="계약 시작일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
             <MudNumericField T="decimal?" @bind-Value="contractForm.MonthlyFee" Label="월 수수료" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" />
         </MudForm>
diff --git a/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor b/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor
index 85a2836..678d87b 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqList.razor
@@ -95,9 +95,26 @@
 </MudPaper>
 
 @code {
+    [CascadingParameter]
+    private Task<AuthenticationState>? AuthStateTask { get; set; }
+
     private List<Faq>? faqs;
 
-    protected override async Task OnInitializedAsync() => await LoadAsync();
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            if (AuthStateTask != null)
+            {
+                var authState = await AuthStateTask;
+                if (authState.User.Identity?.IsAuthenticated == true)
+                {
+                    await LoadAsync();
+                    StateHasChanged();
+                }
+            }
+        }
+    }
 
     private async Task LoadAsync()
     {
diff --git a/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryList.razor b/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryList.razor
index 4a42eab..7a40ff8 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryList.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Inquiries/InquiryList.razor
@@ -46,11 +46,31 @@ else
 </MudPaper>
 
 @code {
+    [CascadingParameter]
+    private Task<AuthenticationState>? AuthStateTask { get; set; }
+
     private bool isLoading = true;
     private IReadOnlyList<Domain.Entities.Inquiry> allInquiries = [];
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        if (firstRender)
+        {
+            if (AuthStateTask != null)
+            {
+                var authState = await AuthStateTask;
+                if (authState.User.Identity?.IsAuthenticated == true)
+                {
+                    await LoadData();
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
         try
         {
             var (items, _) = await InquiryClient.GetPagedAsync(1, 200);
diff --git a/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor b/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor
index 6642373..cb54fbf 100644
--- a/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/RevenueTrackings.razor
@@ -102,7 +102,13 @@
             <MudTextField T="string" @bind-Value="revenueForm.InvoiceNumber" Label="청구번호" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
             <MudDatePicker @bind-Date="revenueForm.InvoiceDate" Label="청구일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
             <MudNumericField T="decimal" @bind-Value="revenueForm.Amount" Label="청구액" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
-            <MudTextField T="string" @bind-Value="revenueForm.ServiceType" Label="서비스 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" />
+            <MudSelect T="string" @bind-Value="revenueForm.ServiceType" Label="서비스 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4">
+                <MudSelectItem Value="@("기장 수수료")">기장 수수료</MudSelectItem>
+                <MudSelectItem Value="@("세무조정료")">세무조정료</MudSelectItem>
+                <MudSelectItem Value="@("세무상담료")">세무상담료</MudSelectItem>
+                <MudSelectItem Value="@("신고 대행료")">신고 대행료</MudSelectItem>
+                <MudSelectItem Value="@("자문 수수료")">자문 수수료</MudSelectItem>
+            </MudSelect>
             <MudDatePicker @bind-Date="revenueForm.DueDate" Label="납부예정일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" />
         </MudForm>
     </DialogContent>
diff --git a/TaxBaik.Web/Components/Admin/Pages/TaxFilingSchedules.razor b/TaxBaik.Web/Components/Admin/Pages/TaxFilingSchedules.razor
index d3037f0..14ce07b 100644
--- a/TaxBaik.Web/Components/Admin/Pages/TaxFilingSchedules.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/TaxFilingSchedules.razor
@@ -129,7 +129,16 @@
                     <MudSelectItem Value="@client.Id">@client.CompanyName</MudSelectItem>
                 }
             </MudSelect>
-            <MudTextField T="string" @bind-Value="scheduleForm.FilingType" Label="신고 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
+            <MudSelect T="string" @bind-Value="scheduleForm.FilingType" Label="신고 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true">
+                <MudSelectItem Value="@("종합소득세")">종합소득세</MudSelectItem>
+                <MudSelectItem Value="@("부가가치세")">부가가치세</MudSelectItem>
+                <MudSelectItem Value="@("법인세")">법인세</MudSelectItem>
+                <MudSelectItem Value="@("원천세")">원천세</MudSelectItem>
+                <MudSelectItem Value="@("종합부동산세")">종합부동산세</MudSelectItem>
+                <MudSelectItem Value="@("양도소득세")">양도소득세</MudSelectItem>
+                <MudSelectItem Value="@("상속·증여세")">상속·증여세</MudSelectItem>
+                <MudSelectItem Value="@("세무조정")">세무조정</MudSelectItem>
+            </MudSelect>
             <MudDatePicker @bind-Date="scheduleForm.DueDate" Label="마감일" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
             <MudNumericField T="int" @bind-Value="scheduleForm.FilingYear" Label="신고연도" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true" />
         </MudForm>
diff --git a/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor b/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor
index 407d357..4b29aaa 100644
--- a/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/TaxProfiles.razor
@@ -90,7 +90,17 @@ else
                     <MudSelectItem Value="@client.Id">@client.CompanyName</MudSelectItem>
                 }
             </MudSelect>
-            <MudTextField T="string" @bind-Value="profileForm.BusinessType" Label="사업 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" />
+            <MudSelect T="string" @bind-Value="profileForm.BusinessType" Label="사업 유형" Variant="Variant.Outlined" FullWidth="true" Class="mb-4" Required="true">
+                <MudSelectItem Value="@("일반제조업")">일반제조업</MudSelectItem>
+                <MudSelectItem Value="@("도소매업")">도소매업</MudSelectItem>
+                <MudSelectItem Value="@("서비스업")">서비스업</MudSelectItem>
+                <MudSelectItem Value="@("정보통신업")">정보통신업</MudSelectItem>
+                <MudSelectItem Value="@("부동산업")">부동산업</MudSelectItem>
+                <MudSelectItem Value="@("건설업")">건설업</MudSelectItem>
+                <MudSelectItem Value="@("음식점업")">음식점업</MudSelectItem>
+                <MudSelectItem Value="@("프리랜서")">프리랜서</MudSelectItem>
+                <MudSelectItem Value="@("기타")">기타</MudSelectItem>
+            </MudSelect>
             <MudSelect T="string" @bind-Value="profileForm.TaxRiskLevel" Label="위험도" Variant="Variant.Outlined" FullWidth="true" Class="mb-4">
                 <MudSelectItem Value="@("low")">낮음</MudSelectItem>
                 <MudSelectItem Value="@("normal")">보통</MudSelectItem>