diff --git a/wp-content/themes/ccat/app/components/auth/LoginForm.vue b/wp-content/themes/ccat/app/components/auth/LoginForm.vue
index 451461f..cc74ced 100644
--- a/wp-content/themes/ccat/app/components/auth/LoginForm.vue
+++ b/wp-content/themes/ccat/app/components/auth/LoginForm.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
-const { loginFields, login } = useAuth();
+const { isLoggedIn, loginFields, login } = useAuth();
+if (isLoggedIn.value) {
+  throw createError({ statusCode: 500, statusMessage: "Erreur serveur", message: "Le formulaire de connexion ne peut pas être affiché pour un utilisateur déjà connecté." });
+}
 </script>
 
 <template>
diff --git a/wp-content/themes/ccat/app/components/auth/LogoutForm.vue b/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
index e6ec18b..2a6f5e7 100644
--- a/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
+++ b/wp-content/themes/ccat/app/components/auth/LogoutForm.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
-const { logout } = useAuth();
+const { isLoggedIn, logout } = useAuth();
+if (!isLoggedIn.value) {
+  throw createError({ statusCode: 500, statusMessage: "Erreur serveur", message: "Le formulaire de déconnexion ne peut pas être affiché pour un utilisateur déjà déconnecté." });
+}
 </script>
 
 <template>
diff --git a/wp-content/themes/ccat/app/components/site/SiteHeaderTopAuth.vue b/wp-content/themes/ccat/app/components/site/SiteHeaderTopAuth.vue
index 94f7847..a03d55d 100644
--- a/wp-content/themes/ccat/app/components/site/SiteHeaderTopAuth.vue
+++ b/wp-content/themes/ccat/app/components/site/SiteHeaderTopAuth.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 const props = defineProps<{ showLabels: boolean }>();
-const { loggedIn } = useUserSession();
-const label = computed(() => props.showLabels ? (loggedIn.value ? "Déconnexion" : "Connexion") : undefined);
+const { isLoggedIn } = useAuth();
+const label = computed(() => props.showLabels ? (isLoggedIn.value ? "Déconnexion" : "Connexion") : undefined);
 </script>
 
 <template>
   <AuthState>
     <UButton
-      :icon="loggedIn ? 'i-lucide-log-out' : 'i-lucide-log-in'"
+      :icon="isLoggedIn ? 'i-lucide-log-out' : 'i-lucide-log-in'"
       color="neutral"
       to="/connexion"
       :label="label"
diff --git a/wp-content/themes/ccat/app/components/site/SiteHeaderTopMember.vue b/wp-content/themes/ccat/app/components/site/SiteHeaderTopMember.vue
index badaaf5..9b953fe 100644
--- a/wp-content/themes/ccat/app/components/site/SiteHeaderTopMember.vue
+++ b/wp-content/themes/ccat/app/components/site/SiteHeaderTopMember.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 const props = defineProps<{ showLabels: boolean }>();
-const { loggedIn } = useUserSession();
-const label = computed(() => props.showLabels ? (loggedIn.value ? "Déconnexion" : "Connexion") : undefined);
-const to = computed(() => loggedIn.value ? "/espace-membre" : "/devenir-membre");
+const { isLoggedIn } = useAuth();
+const label = computed(() => props.showLabels ? (isLoggedIn.value ? "Espace membre" : "Devenir membre") : undefined);
+const to = computed(() => isLoggedIn.value ? "/espace-membre" : "/devenir-membre");
 </script>
 
 <template>
diff --git a/wp-content/themes/ccat/app/pages/connexion.vue b/wp-content/themes/ccat/app/pages/connexion.vue
index 4fe7a38..bc8ef85 100644
--- a/wp-content/themes/ccat/app/pages/connexion.vue
+++ b/wp-content/themes/ccat/app/pages/connexion.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 definePageMeta({ layout: "auth" });
 
-const { loggedIn } = useUserSession();
-
-useSeoMeta({ title: loggedIn.value ? "Déconnexion" : "Connexion" });
+const { isLoggedIn } = useAuth();
+useSeoMeta({ title: isLoggedIn.value ? "Déconnexion" : "Connexion" });
 </script>
 
 <template>
-  <LogoutForm v-if="loggedIn" />
-  <LoginForm v-else />
+  <AuthState>
+    <LogoutForm v-if="isLoggedIn" />
+    <LoginForm v-else />
+  </AuthState>
 </template>