diff --git a/open-isle-cli/src/components/HeaderComponent.vue b/open-isle-cli/src/components/HeaderComponent.vue
index fe2fa3648..1ff80eeba 100644
--- a/open-isle-cli/src/components/HeaderComponent.vue
+++ b/open-isle-cli/src/components/HeaderComponent.vue
@@ -32,7 +32,8 @@
 </template>
 
 <script>
-import { isLogin, clearToken, fetchCurrentUser } from '../utils/auth'
+import { authState, clearToken, fetchCurrentUser } from '../utils/auth'
+import { watch } from 'vue'
 
 export default {
   name: 'HeaderComponent',
@@ -50,16 +51,41 @@ export default {
   },
   computed: {
     isLogin() {
-      return isLogin()
+      return authState.loggedIn
     }
   },
   async mounted() {
-    if (this.isLogin) {
-      const user = await fetchCurrentUser()
-      if (user && user.avatar) {
-        this.avatar = user.avatar
+    const updateAvatar = async () => {
+      if (authState.loggedIn) {
+        const user = await fetchCurrentUser()
+        if (user && user.avatar) {
+          this.avatar = user.avatar
+        }
+      } else {
+        this.avatar = 'https://picsum.photos/40'
       }
     }
+
+    await updateAvatar()
+
+    watch(() => authState.loggedIn, async () => {
+      await updateAvatar()
+    })
+
+    watch(() => this.$route.fullPath, () => {
+      this.dropdownVisible = false
+    })
+
+    this.onClickOutside = (e) => {
+      if (!this.$el.contains(e.target)) {
+        this.dropdownVisible = false
+      }
+    }
+    document.addEventListener('click', this.onClickOutside)
+  },
+
+  beforeUnmount() {
+    document.removeEventListener('click', this.onClickOutside)
   },
 
   methods: {
diff --git a/open-isle-cli/src/utils/auth.js b/open-isle-cli/src/utils/auth.js
index 66d503a36..68277c9f1 100644
--- a/open-isle-cli/src/utils/auth.js
+++ b/open-isle-cli/src/utils/auth.js
@@ -1,17 +1,26 @@
 import { API_BASE_URL } from '../main'
+import { reactive } from 'vue'
 
 const TOKEN_KEY = 'token'
 
+export const authState = reactive({
+  loggedIn: false
+})
+
+authState.loggedIn = localStorage.getItem(TOKEN_KEY) !== null && localStorage.getItem(TOKEN_KEY) !== ''
+
 export function getToken() {
   return localStorage.getItem(TOKEN_KEY)
 }
 
 export function setToken(token) {
   localStorage.setItem(TOKEN_KEY, token)
+  authState.loggedIn = true
 }
 
 export function clearToken() {
   localStorage.removeItem(TOKEN_KEY)
+  authState.loggedIn = false
 }
 
 export async function fetchCurrentUser() {
@@ -29,9 +38,7 @@ export async function fetchCurrentUser() {
 }
 
 export function isLogin() {
-  const token = getToken()
-  console.log('token', token)
-  return token !== null && token !== ''
+  return authState.loggedIn
 }
 
 export async function checkToken() {
@@ -41,8 +48,10 @@ export async function checkToken() {
     const res = await fetch(`${API_BASE_URL}/api/auth/check`, {
       headers: { Authorization: `Bearer ${token}` }
     })
+    authState.loggedIn = res.ok
     return res.ok
   } catch (e) {
+    authState.loggedIn = false
     return false
   }
 }