diff --git a/app/components/AppShell.vue b/app/components/AppShell.vue
index f593412..3c83137 100644
--- a/app/components/AppShell.vue
+++ b/app/components/AppShell.vue
@@ -10,7 +10,7 @@ withDefaults(
 )
 
 const route = useRoute()
-const { loggedIn, user, refresh, clear, pending } = useAuthSession()
+const { loggedIn, user, refresh, clear, initialized } = useAuthSession()
 const { fetchData } = useClientApi()
 const { allowRegister, siteName } = useGlobalConfig()
 
@@ -93,7 +93,7 @@ async function logout() {
   try {
     await fetchData<{ success: boolean }>('/api/auth/logout', { method: 'POST' })
     clear()
-    await navigateTo('/login')
+    await navigateTo('/')
   } finally {
     logoutLoading.value = false
   }
@@ -158,7 +158,7 @@ async function logout() {
           </div>
 
           <div class="flex shrink-0 items-center gap-2">
-            <template v-if="pending && !loggedIn">
+            <template v-if="!initialized">
               <USkeleton class="h-9 w-24 rounded-md" />
             </template>
 
diff --git a/app/components/PostComments.vue b/app/components/PostComments.vue
index 55cf70c..621f40d 100644
--- a/app/components/PostComments.vue
+++ b/app/components/PostComments.vue
@@ -164,10 +164,10 @@ async function submitComment() {
     <h2 class="text-lg font-semibold">
       评论
     </h2>
-    <p v-if="pending" class="text-muted">
+    <p v-if="pending && !data" class="text-muted">
       加载评论…
     </p>
-    <p v-else-if="error" class="text-muted">
+    <p v-else-if="error && !data" class="text-muted">
       评论加载失败
     </p>
     <div v-else class="space-y-3">
diff --git a/app/layouts/public.vue b/app/layouts/public.vue
index 38dbb92..b068c25 100644
--- a/app/layouts/public.vue
+++ b/app/layouts/public.vue
@@ -7,7 +7,7 @@ import {
 import { unwrapApiBody, type ApiResponse } from '../utils/http/factory'
 
 const route = useRoute()
-const { loggedIn, pending, refresh } = useAuthSession()
+const { loggedIn, refresh, initialized } = useAuthSession()
 const { siteName } = useGlobalConfig()
 
 const showPublicLayoutToggle = computed(() => /^\/@[^/]+$/.test(route.path))
@@ -40,14 +40,25 @@ const { data: publicHomeHeader } = await useAsyncData(
 
 const headerBrandTo = computed(() => (profileSlug.value ? `/@${profileSlug.value}` : '/'))
 const headerBrandTitle = computed(() => {
-  if (profileSlug.value && publicHomeHeader.value?.title) {
-    return publicHomeHeader.value.title
+  if (!profileSlug.value) {
+    return siteName.value
+  }
+  const t = publicHomeHeader.value?.title
+  if (typeof t === 'string' && t.trim().length) {
+    return t.trim()
   }
   return siteName.value
 })
-const headerBrandIconUrl = computed(() =>
-  profileSlug.value ? publicHomeHeader.value?.iconUrl ?? null : null,
-)
+const headerBrandIconUrl = computed(() => {
+  if (!profileSlug.value) {
+    return null
+  }
+  const u = publicHomeHeader.value?.iconUrl
+  if (typeof u !== 'string' || !u.trim()) {
+    return null
+  }
+  return u.trim()
+})
 
 type LayoutBySlug = Record<string, PublicHomeLayoutMode>
 
@@ -137,7 +148,7 @@ onMounted(() => {
                 <span class="hidden sm:inline">阅读</span>
               </UButton>
             </div>
-            <template v-if="pending && !loggedIn">
+            <template v-if="!initialized">
               <USkeleton class="h-5 w-12 rounded" />
             </template>
             <NuxtLink
diff --git a/app/pages/@[publicSlug]/about/index.vue b/app/pages/@[publicSlug]/about/index.vue
index 946f0ea..112a35b 100644
--- a/app/pages/@[publicSlug]/about/index.vue
+++ b/app/pages/@[publicSlug]/about/index.vue
@@ -37,10 +37,10 @@ useHead(() => ({
 </script>
 
 <template>
-  <div v-if="pending" class="text-muted py-10">
+  <div v-if="pending && !data" class="text-muted py-10">
     <UContainer>加载中…</UContainer>
   </div>
-  <UContainer v-else-if="error" class="py-10">
+  <UContainer v-else-if="error && !data" class="py-10">
     <UAlert color="error" title="无法加载页面" description="该用户没有公开的简介，或主页不存在。" />
   </UContainer>
   <UContainer v-else-if="data" class="py-10 max-w-3xl space-y-8">
diff --git a/app/pages/@[publicSlug]/index.vue b/app/pages/@[publicSlug]/index.vue
index b54f219..7e6764a 100644
--- a/app/pages/@[publicSlug]/index.vue
+++ b/app/pages/@[publicSlug]/index.vue
@@ -148,10 +148,10 @@ const showBioReadMore = computed(() => {
 </script>
 
 <template>
-  <div v-if="pending" class="text-muted py-10">
+  <div v-if="pending && !data" class="text-muted py-10">
     <UContainer>加载中…</UContainer>
   </div>
-  <UContainer v-else-if="error" class="py-10">
+  <UContainer v-else-if="error && !data" class="py-10">
     <UAlert color="error" title="无法加载主页" />
   </UContainer>
 
diff --git a/app/pages/@[publicSlug]/posts/[postSlug].vue b/app/pages/@[publicSlug]/posts/[postSlug].vue
index 5ba24eb..b4c6274 100644
--- a/app/pages/@[publicSlug]/posts/[postSlug].vue
+++ b/app/pages/@[publicSlug]/posts/[postSlug].vue
@@ -80,10 +80,10 @@ const editPostHref = computed(() =>
 
 <template>
   <UContainer class="py-10 space-y-6">
-    <div v-if="pending" class="text-muted">
+    <div v-if="pending && !data" class="text-muted">
       加载中…
     </div>
-    <UAlert v-else-if="error" color="error" title="文章不存在或未公开" />
+    <UAlert v-else-if="error && !data" color="error" title="文章不存在或未公开" />
     <template v-else-if="data">
       <div class="flex flex-wrap items-center gap-2">
         <UButton :to="`/@${publicSlug}`" variant="ghost" color="neutral" size="sm" class="-ml-2">
diff --git a/app/pages/@[publicSlug]/posts/index.vue b/app/pages/@[publicSlug]/posts/index.vue
index c1affc4..3348049 100644
--- a/app/pages/@[publicSlug]/posts/index.vue
+++ b/app/pages/@[publicSlug]/posts/index.vue
@@ -77,11 +77,11 @@ const { data, pending, error } = await useAsyncData(
 
 <template>
   <UContainer class="py-8 lg:py-10 max-w-6xl">
-    <div v-if="pending" class="text-muted py-10">
+    <div v-if="pending && !data" class="text-muted py-10">
       加载中…
     </div>
     <UAlert
-      v-else-if="error"
+      v-else-if="error && !data"
       color="error"
       title="无法加载文章列表"
       class="my-6"
diff --git a/app/pages/@[publicSlug]/reading/index.vue b/app/pages/@[publicSlug]/reading/index.vue
index 7f25a31..7daa3c8 100644
--- a/app/pages/@[publicSlug]/reading/index.vue
+++ b/app/pages/@[publicSlug]/reading/index.vue
@@ -89,11 +89,11 @@ const { data, pending, error } = await useAsyncData(
 
 <template>
   <UContainer class="py-8 lg:py-10 max-w-6xl">
-    <div v-if="pending" class="text-muted py-10">
+    <div v-if="pending && !data" class="text-muted py-10">
       加载中…
     </div>
     <UAlert
-      v-else-if="error"
+      v-else-if="error && !data"
       color="error"
       title="无法加载阅读列表"
       class="my-6"
diff --git a/app/pages/@[publicSlug]/timeline/index.vue b/app/pages/@[publicSlug]/timeline/index.vue
index 0468a47..0ff4929 100644
--- a/app/pages/@[publicSlug]/timeline/index.vue
+++ b/app/pages/@[publicSlug]/timeline/index.vue
@@ -81,11 +81,11 @@ const { data, pending, error } = await useAsyncData(
 
 <template>
   <UContainer class="py-8 lg:py-10 max-w-6xl">
-    <div v-if="pending" class="text-muted py-10">
+    <div v-if="pending && !data" class="text-muted py-10">
       加载中…
     </div>
     <UAlert
-      v-else-if="error"
+      v-else-if="error && !data"
       color="error"
       title="无法加载时光机"
       class="my-6"
diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue
index be2f7b9..2326ae3 100644
--- a/app/pages/index/index.vue
+++ b/app/pages/index/index.vue
@@ -39,7 +39,7 @@ async function logout() {
   try {
     await fetchData<{ success: boolean }>('/api/auth/logout', { method: 'POST' })
     clear()
-    await navigateTo('/login')
+    await navigateTo('/')
   } finally {
     logoutLoading.value = false
   }
diff --git a/app/pages/me/profile/index.vue b/app/pages/me/profile/index.vue
index e94cb27..e001ab4 100644
--- a/app/pages/me/profile/index.vue
+++ b/app/pages/me/profile/index.vue
@@ -243,14 +243,14 @@ async function save() {
       <UFormField
         label="公开主页顶栏名称"
         name="publicHomeHeaderTitle"
-        description="在 /@你的 slug 页面左上角显示。留空则使用昵称，昵称也为空时使用站点名称。"
+        description="在 /@你的 slug 页面左上角显示。留空则使用全站站点名称。"
       >
-        <UInput v-model="state.publicHomeHeaderTitle" maxlength="64" placeholder="可选" />
+        <UInput v-model="state.publicHomeHeaderTitle" maxlength="64" placeholder="可选，默认与站点名称相同" />
       </UFormField>
       <UFormField
         label="公开主页顶栏图标"
         name="publicHomeHeaderIconUrl"
-        description="留空则使用「公开」可见的头像；若头像非公开则显示默认图标。支持站内路径或 http(s) 链接。"
+        description="留空则显示默认图标（与站点顶栏一致）。支持站内路径或 http(s) 链接。"
       >
         <div class="flex flex-col gap-3 sm:flex-row sm:items-start">
           <span class="flex h-10 w-10 shrink-0 items-center justify-center overflow-hidden rounded-lg bg-primary/10 text-primary ring-1 ring-default">
diff --git a/app/pages/p/[publicSlug]/t/[shareToken].vue b/app/pages/p/[publicSlug]/t/[shareToken].vue
index 28f80b1..010b8b8 100644
--- a/app/pages/p/[publicSlug]/t/[shareToken].vue
+++ b/app/pages/p/[publicSlug]/t/[shareToken].vue
@@ -36,10 +36,10 @@ const renderedUnlistedPostBody = computed(() => {
 
 <template>
   <UContainer class="py-10 space-y-6">
-    <div v-if="pending" class="text-muted">
+    <div v-if="pending && !data" class="text-muted">
       加载中…
     </div>
-    <UAlert v-else-if="error" color="error" title="链接无效或内容已不存在" />
+    <UAlert v-else-if="error && !data" color="error" title="链接无效或内容已不存在" />
     <template v-else-if="data">
       <UBadge color="neutral">
         {{ data.kind }}
diff --git a/packages/drizzle-pkg/db.sqlite b/packages/drizzle-pkg/db.sqlite
index be9e14b..31ab19f 100644
Binary files a/packages/drizzle-pkg/db.sqlite and b/packages/drizzle-pkg/db.sqlite differ
diff --git a/server/api/public/profile/[publicSlug]/home-header.get.ts b/server/api/public/profile/[publicSlug]/home-header.get.ts
index a02e5fe..6d8ee14 100644
--- a/server/api/public/profile/[publicSlug]/home-header.get.ts
+++ b/server/api/public/profile/[publicSlug]/home-header.get.ts
@@ -27,11 +27,10 @@ export default defineEventHandler(async (event) => {
 
   const configuredTitle = typeof titleCfg === "string" ? titleCfg.trim() : "";
   const configuredIcon = typeof iconCfg === "string" ? iconCfg.trim() : "";
-  const publicAvatar = owner.avatarVisibility === "public" ? owner.avatar : null;
-  const nickname = owner.nickname?.trim() ?? "";
+  const site = typeof siteName === "string" ? siteName.trim() : "";
 
-  const title = configuredTitle || nickname || siteName;
-  const iconUrl = configuredIcon || publicAvatar || null;
+  const title = configuredTitle || site;
+  const iconUrl = configuredIcon.length > 0 ? configuredIcon : null;
 
   return R.success({ title, iconUrl });
 });