diff --git a/src/components/repo/authv2.ts b/src/components/repo/authv2.ts
index 3883f71..b44f771 100644
--- a/src/components/repo/authv2.ts
+++ b/src/components/repo/authv2.ts
@@ -89,6 +89,6 @@ export class AuthV2Repo {
     }
 }
 
-export const loggedIn = writable(false);
+export const loggedIn = writable<boolean | undefined>(undefined);
 
 export const authV2Repo = readable(new AuthV2Repo());
diff --git a/src/pages/dashboard.astro b/src/pages/dashboard.astro
index 770d08b..c4ad889 100644
--- a/src/pages/dashboard.astro
+++ b/src/pages/dashboard.astro
@@ -1,22 +1,21 @@
 ---
 import DashboardComponent from "@components/DashboardComponent.svelte";
 import PageLayout from "@layouts/PageLayout.astro";
-import {t} from "astro-i18n";
+import { t } from "astro-i18n";
 ---
 
 <PageLayout title={t("dashboard.page")}>
-    <script>
-        import {l} from "../util/util";
-        import {navigate} from "astro:transitions/client";
-        import {get} from "svelte/store";
-        import {loggedIn} from "../components/repo/authv2";
-        document.addEventListener("astro:page-load", () => {
+    <script is:inline data-astro-rerun>
+        import { l } from "../util/util";
+        import { navigate } from "astro:transitions/client";
+        import { loggedIn } from "../components/repo/authv2";
+        loggedIn.subscribe((value) => {
             if (window.location.href.endsWith("/dashboard") || window.location.href.endsWith("/dashboard/")) {
-                if (!get(loggedIn)) {
-                    navigate(l("/login"), {});
+                if (value === false) {
+                    navigate(l("/dashboard"), { history: "replace" });
                 }
             }
         });
     </script>
     <DashboardComponent client:only="svelte" />
-</PageLayout>
\ No newline at end of file
+</PageLayout>
diff --git a/src/pages/login.astro b/src/pages/login.astro
index 55e5c25..70036f9 100644
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@@ -6,15 +6,14 @@ import BackgroundImage from "../components/BackgroundImage.astro";
 ---
 
 <NavbarLayout title={t("login.page")}>
-    <script>
+    <script is:inline data-astro-rerun>
         import { l } from "../util/util";
         import { navigate } from "astro:transitions/client";
         import { loggedIn } from "../components/repo/authv2";
-        import { get } from "svelte/store";
 
-        document.addEventListener("astro:page-load", () => {
+        loggedIn.subscribe((value) => {
             if (window.location.href.endsWith("/login") || window.location.href.endsWith("/login/")) {
-                if (get(loggedIn)) {
+                if (value) {
                     navigate(l("/dashboard"), { history: "replace" });
                 }
             }