diff --git a/src/App.vue b/src/App.vue
index b4895f0..ab8c8d5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,6 +29,7 @@ import Modal from "./components/Modal.vue";
 import Notification from "./components/Notification.vue";
 import { config } from "./config";
 import { useConfigurationStore } from "@/stores/configuration";
+import { resetAllPiniaStores } from "@/helpers/piniaReset";
 </script>
 
 <script lang="ts">
@@ -38,6 +39,7 @@ export default defineComponent({
     ...mapState(useConfigurationStore, ["clubName"]),
   },
   mounted() {
+    resetAllPiniaStores();
     this.configure();
 
     if (!this.authCheck && localStorage.getItem("access_token")) {
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 487b753..0d3f55a 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -76,7 +76,6 @@ import { defineComponent } from "vue";
 import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
-import { resetAllPiniaStores } from "@/helpers/piniaReset";
 import FormBottomBar from "@/components/FormBottomBar.vue";
 import AppLogo from "@/components/AppLogo.vue";
 import { mapState } from "pinia";
@@ -99,7 +98,6 @@ export default defineComponent({
     ...mapState(useConfigurationStore, ["clubName"]),
   },
   mounted() {
-    resetAllPiniaStores();
     this.username = localStorage.getItem("username") ?? "";
     this.routine = localStorage.getItem("routine") ?? "";