diff --git a/client/src/components/global/navbar/navbar.vue b/client/src/components/global/navbar/navbar.vue
index 85ec442..c33f250 100644
--- a/client/src/components/global/navbar/navbar.vue
+++ b/client/src/components/global/navbar/navbar.vue
@@ -10,8 +10,8 @@
                     <router-link :to="link.url" class="nav-link">{{ link.text }}</router-link>
                 </li>
             </ul>
-            <div v-if="loggedIn" class="navbar-nav">
-                <router-link :to="'/profil'" class="nav-link">Profil</router-link>
+            <div v-if="user" class="navbar-nav">
+                <router-link :to="'/profil'" class="nav-link">{{ user.name }}</router-link>
                 <div @click="logoutUser()" class="nav-link">Deconnexion</div>
             </div>
             <div v-else class="navbar-nav">
@@ -39,8 +39,8 @@
             }
         },
         computed: {
-            loggedIn() {
-                return this.$store.state.status.loggedIn;
+            user() {
+                return this.$store.state.user
             }
         },
         methods: {
diff --git a/client/src/components/spells/spell-card.vue b/client/src/components/spells/spell-card.vue
index 2ae4a13..6af67df 100644
--- a/client/src/components/spells/spell-card.vue
+++ b/client/src/components/spells/spell-card.vue
@@ -57,7 +57,7 @@
                         <span> = {{variable.description}}</span>
                     </span>
                 </div>
-                <footer class="text-right">
+                <footer v-if="user" class="text-right">
                     <a class="h5 text-secondary mr-1">
                         <i class="mad" @click="editSpell(spell)">edit</i>
                     </a>
@@ -86,7 +86,12 @@ export default {
         }
     },
     created() {
-        this.main_school = this.main_school.toLowerCase();
+        this.main_school = this.main_school.toLowerCase()
+    },
+    computed: {
+        user() {
+            return this.$store.state.user
+        }
     },
     methods: {
         editSpell(spell) {
diff --git a/client/src/components/spells/spells-list.vue b/client/src/components/spells/spells-list.vue
index 4c8d047..8e93f4c 100644
--- a/client/src/components/spells/spells-list.vue
+++ b/client/src/components/spells/spells-list.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="spell-list-wrapper">
+
         <div class="mb-4">
             <form>
                 <div class="form-group mb-2">
@@ -29,10 +30,17 @@
                 </div>
             </form>
         </div>
-        <button type="button" class="btn font-display font-weight-bold btn-lg btn-outline-dark btn-block shadow-sm mb-4" @click="showAdd">
+
+        <button
+            v-if="user"
+            @click="showAdd"
+            type="button"
+            class="btn font-display font-weight-bold btn-lg btn-outline-dark btn-block shadow-sm mb-4">
+
             <i class="mad">add</i>
             <span>Ajouter un sort</span>
         </button>
+
         <div
             v-if="computedSpells.length > 0"
             class="spell-list-wrapper">
@@ -104,6 +112,9 @@ export default {
     computed: {
         computedSpells() {
             return this.spells
+        },
+        user() {
+            return this.$store.state.user
         }
     },
     beforeMount() {
diff --git a/client/src/pages/user/profile-page.vue b/client/src/pages/user/profile-page.vue
index b24c702..61d836c 100644
--- a/client/src/pages/user/profile-page.vue
+++ b/client/src/pages/user/profile-page.vue
@@ -1,17 +1,20 @@
 <template>
     <div class="container-fluid p-4" id="spell-container">
-        <h1 class="display-3 font-display mb-3">{{ user.name }}</h1>
+        <div class="display-3 font-display mb-3">
+            <span class="username">{{ user.name }}</span>
+            <span v-if="user.verified" class="verified"><i class="mad">check_circle</i></span>
+        </div>
     </div>
 </template>
 
 <script>
 export default {
     name: 'profile-page',
-    data() {
-        return {
-            user: this.$cookies.get("U_"),
+    computed: {
+        user() {
+            return this.$store.state.user
         }
-    }
+    },
 }
 </script>