diff --git a/frontend/components/organisms/layout/TheHeader.vue b/frontend/components/organisms/layout/TheHeader.vue
index 774c95c6..2aaf87fd 100644
--- a/frontend/components/organisms/layout/TheHeader.vue
+++ b/frontend/components/organisms/layout/TheHeader.vue
@@ -59,15 +59,15 @@
     </v-btn>
     <v-menu
       v-if="isAuthenticated"
-      bottom
+      offset-y
     >
       <template v-slot:activator="{ on }">
-        <v-btn v-on="on" outlined>
-          {{ username }}
+        <v-btn v-on="on" on icon>
+          <v-icon>mdi-dots-vertical</v-icon>
         </v-btn>
       </template>
-
-      <v-list dense>
+      <v-list>
+        <v-subheader>{{ username }}</v-subheader>
         <v-list-item @click="signout">
           <v-list-item-icon>
             <v-icon>mdi-logout</v-icon>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions, mapState } from 'vuex'
 import TheColorModeSwitcher from '@/components/organisms/layout/TheColorModeSwitcher'
 
 export default {
@@ -99,13 +99,13 @@ export default {
         { title: 'Sentiment Analysis', link: 'sentiment-analysis' },
         { title: 'Translation', link: 'translation' },
         { title: 'Text to SQL', link: 'text-to-sql' }
-      ],
-      username: localStorage.getItem('name')
+      ]
     }
   },
 
   computed: {
-    ...mapGetters('auth', ['isAuthenticated'])
+    ...mapGetters('auth', ['isAuthenticated']),
+    ...mapState('auth', ['username'])
   },
 
   methods: {
diff --git a/frontend/store/auth.js b/frontend/store/auth.js
index af0d8af5..b5371fd4 100644
--- a/frontend/store/auth.js
+++ b/frontend/store/auth.js
@@ -3,7 +3,8 @@ import ApiService from '@/services/api.service'
 import AuthService from '@/services/auth.service'
 
 export const state = () => ({
-  token: null
+  token: null,
+  username: null
 })
 
 export const mutations = {
@@ -12,6 +13,12 @@ export const mutations = {
   },
   clearToken(state) {
     state.token = null
+  },
+  setUsername(state, username) {
+    state.username = username
+  },
+  clearUsername(state) {
+    state.username = null
   }
 }
 
@@ -26,8 +33,8 @@ export const actions = {
     return AuthService.postCredential(authData)
       .then((result) => {
         commit('setToken', result.data.token)
+        commit('setUsername', authData.username)
         localStorage.setItem('token', result.data.token)
-        localStorage.setItem('name', authData.username)
         Cookie.set('jwt', result.data.token)
         ApiService.setHeader(result.data.token)
       })
@@ -53,10 +60,10 @@ export const actions = {
   },
   logout({ commit }) {
     commit('clearToken')
+    commit('clearUsername')
     Cookie.remove('jwt')
     if (process.client) {
       localStorage.removeItem('token')
-      localStorage.removeItem('name')
     }
   }
 }