diff --git a/src/lib/components/common/Spinner.svelte b/src/lib/components/common/Spinner.svelte
index 206c7f5ce..4b7f5e396 100644
--- a/src/lib/components/common/Spinner.svelte
+++ b/src/lib/components/common/Spinner.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
-	export let className: string = 'text-white';
-	export let theme: 'blue' | 'white' | 'black' = 'white';
+	export let className: string = '';
 </script>
 
 <div class="flex justify-center text-center {className}">
-	<svg
-		class="animate-spin -ml-1 mr-3 h-5 w-5 {theme === 'blue'
-			? 'text-sky-600'
-			: theme === 'white'
-			? 'text-white'
-			: 'text-gray-600'} "
-		xmlns="http://www.w3.org/2000/svg"
-		fill="none"
-		viewBox="0 0 24 24"
+	<svg class="size-5" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"
+		><style>
+			.spinner_ajPY {
+				transform-origin: center;
+				animation: spinner_AtaB 0.75s infinite linear;
+			}
+			@keyframes spinner_AtaB {
+				100% {
+					transform: rotate(360deg);
+				}
+			}
+		</style><path
+			d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z"
+			opacity=".25"
+		/><path
+			d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"
+			class="spinner_ajPY"
+		/></svg
 	>
-		<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
-		<path
-			class="opacity-75"
-			fill="currentColor"
-			d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-		/>
-	</svg>
 </div>
diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte
index 6b6629467..2dc2a92b2 100644
--- a/src/routes/auth/+page.svelte
+++ b/src/routes/auth/+page.svelte
@@ -1,6 +1,7 @@
 <script>
 	import { goto } from '$app/navigation';
 	import { userSignIn, userSignUp } from '$lib/apis/auths';
+	import Spinner from '$lib/components/common/Spinner.svelte';
 	import { WEBUI_API_BASE_URL, WEBUI_BASE_URL } from '$lib/constants';
 	import { WEBUI_NAME, config, user } from '$lib/stores';
 	import { onMount, getContext } from 'svelte';
@@ -93,109 +94,117 @@
 		</div> -->
 
 		<div class="w-full sm:max-w-lg px-4 min-h-screen flex flex-col">
-			{#if ($config?.trusted_header_auth ?? false)}
+			{#if $config?.trusted_header_auth ?? false}
 				<div class=" my-auto pb-10 w-full">
-					<div class=" text-xl sm:text-2xl font-bold">
-						{$i18n.t('Signing in')}
-						{$i18n.t('to')}
-						{$WEBUI_NAME}
+					<div
+						class="flex items-center justify-center gap-3 text-xl sm:text-2xl text-center font-bold dark:text-gray-200"
+					>
+						<div>
+							{$i18n.t('Signing in')}
+							{$i18n.t('to')}
+							{$WEBUI_NAME}
+						</div>
+
+						<div>
+							<Spinner />
+						</div>
 					</div>
 				</div>
 			{:else}
 				<div class=" my-auto pb-10 w-full">
-				<form
-					class=" flex flex-col justify-center bg-white py-6 sm:py-16 px-6 sm:px-16 rounded-2xl"
-					on:submit|preventDefault={() => {
-						submitHandler();
-					}}
-				>
-					<div class=" text-xl sm:text-2xl font-bold">
-						{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Sign up')}
-						{$i18n.t('to')}
-						{$WEBUI_NAME}
-					</div>
-
-					{#if mode === 'signup'}
-						<div class=" mt-1 text-xs font-medium text-gray-500">
-							ⓘ {$WEBUI_NAME}
-							{$i18n.t(
-								'does not make any external connections, and your data stays securely on your locally hosted server.'
-							)}
+					<form
+						class=" flex flex-col justify-center bg-white py-6 sm:py-16 px-6 sm:px-16 rounded-2xl"
+						on:submit|preventDefault={() => {
+							submitHandler();
+						}}
+					>
+						<div class=" text-xl sm:text-2xl font-bold">
+							{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Sign up')}
+							{$i18n.t('to')}
+							{$WEBUI_NAME}
 						</div>
-					{/if}
 
-					<div class="flex flex-col mt-4">
 						{#if mode === 'signup'}
-							<div>
-								<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Name')}</div>
+							<div class=" mt-1 text-xs font-medium text-gray-500">
+								ⓘ {$WEBUI_NAME}
+								{$i18n.t(
+									'does not make any external connections, and your data stays securely on your locally hosted server.'
+								)}
+							</div>
+						{/if}
+
+						<div class="flex flex-col mt-4">
+							{#if mode === 'signup'}
+								<div>
+									<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Name')}</div>
+									<input
+										bind:value={name}
+										type="text"
+										class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
+										autocomplete="name"
+										placeholder={$i18n.t('Enter Your Full Name')}
+										required
+									/>
+								</div>
+
+								<hr class=" my-3" />
+							{/if}
+
+							<div class="mb-2">
+								<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Email')}</div>
 								<input
-									bind:value={name}
-									type="text"
+									bind:value={email}
+									type="email"
 									class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
-									autocomplete="name"
-									placeholder={$i18n.t('Enter Your Full Name')}
+									autocomplete="email"
+									placeholder={$i18n.t('Enter Your Email')}
 									required
 								/>
 							</div>
 
-							<hr class=" my-3" />
-						{/if}
-
-						<div class="mb-2">
-							<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Email')}</div>
-							<input
-								bind:value={email}
-								type="email"
-								class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
-								autocomplete="email"
-								placeholder={$i18n.t('Enter Your Email')}
-								required
-							/>
+							<div>
+								<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Password')}</div>
+								<input
+									bind:value={password}
+									type="password"
+									class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
+									placeholder={$i18n.t('Enter Your Password')}
+									autocomplete="current-password"
+									required
+								/>
+							</div>
 						</div>
 
-						<div>
-							<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Password')}</div>
-							<input
-								bind:value={password}
-								type="password"
-								class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
-								placeholder={$i18n.t('Enter Your Password')}
-								autocomplete="current-password"
-								required
-							/>
-						</div>
-					</div>
-
-					<div class="mt-5">
-						<button
-							class=" bg-gray-900 hover:bg-gray-800 w-full rounded-full text-white font-semibold text-sm py-3 transition"
-							type="submit"
-						>
-							{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Create Account')}
-						</button>
-
-						<div class=" mt-4 text-sm text-center">
-							{mode === 'signin'
-								? $i18n.t("Don't have an account?")
-								: $i18n.t('Already have an account?')}
-
+						<div class="mt-5">
 							<button
-								class=" font-medium underline"
-								type="button"
-								on:click={() => {
-									if (mode === 'signin') {
-										mode = 'signup';
-									} else {
-										mode = 'signin';
-									}
-								}}
+								class=" bg-gray-900 hover:bg-gray-800 w-full rounded-full text-white font-semibold text-sm py-3 transition"
+								type="submit"
 							>
-								{mode === 'signin' ? $i18n.t('Sign up') : $i18n.t('Sign in')}
+								{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Create Account')}
 							</button>
+
+							<div class=" mt-4 text-sm text-center">
+								{mode === 'signin'
+									? $i18n.t("Don't have an account?")
+									: $i18n.t('Already have an account?')}
+
+								<button
+									class=" font-medium underline"
+									type="button"
+									on:click={() => {
+										if (mode === 'signin') {
+											mode = 'signup';
+										} else {
+											mode = 'signin';
+										}
+									}}
+								>
+									{mode === 'signin' ? $i18n.t('Sign up') : $i18n.t('Sign in')}
+								</button>
+							</div>
 						</div>
-					</div>
-				</form>
-			</div>
+					</form>
+				</div>
 			{/if}
 		</div>
 	</div>