diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index b739aff7..8ad4e4b4 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -57,7 +57,7 @@
 		}
 
 		// redirect to welcome page if setup is not completed
-		if (!$settingsPub.setup_completed && $page.url.pathname !== '/welcome') {
+		if ($settingsPub.setup_completed === false && $page.url.pathname !== '/welcome') {
 			goto('/welcome');
 			return;
 		}
@@ -81,17 +81,17 @@
 			return;
 		}
 
-		if ($pocketbase.authStore.model?.collectionName === 'users') {
+		if ($pocketbase.authStore.isAdmin) {
+			await $pocketbase.admins.authRefresh().catch(() => {
+				goto('/login');
+			});
+		} else {
 			await $pocketbase
 				.collection('users')
 				.authRefresh()
 				.catch(() => {
 					goto('/login');
 				});
-		} else {
-			await $pocketbase.admins.authRefresh().catch(() => {
-				goto('/login');
-			});
 		}
 	});
 
diff --git a/frontend/src/routes/welcome/+page.svelte b/frontend/src/routes/welcome/+page.svelte
index 9fa109a3..dc3e227e 100644
--- a/frontend/src/routes/welcome/+page.svelte
+++ b/frontend/src/routes/welcome/+page.svelte
@@ -19,7 +19,7 @@
 	};
 
 	onMount(() => {
-		if (!$settingsPub.setup_completed && $pocketbase.authStore.isValid) {
+		if ($settingsPub && $settingsPub.setup_completed === false && $pocketbase.authStore.isValid) {
 			$pocketbase.authStore.clear();
 		}
 	});