diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 2dc1dd4a5f..1ec6edbbca 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -7,6 +7,7 @@
       component-name="ThemeSetting"
     />
     <el-dialog
+      v-if="$route.path !== '/login'"
       :visible.sync="showPasswordModifiedDialog"
       append-to-body
       :title="$t('user.change_password')"
@@ -35,6 +36,12 @@ export default {
       showPasswordModifiedDialog: false
     }
   },
+  mounted() {
+    const passwordModified = JSON.parse(localStorage.getItem('passwordModified'))
+    if (typeof passwordModified === 'boolean') {
+      this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified)
+    }
+  },
   watch: {
     passwordModified: {
       handler(val) {
diff --git a/frontend/src/store/modules/user.js b/frontend/src/store/modules/user.js
index 4910519ee5..91ca204667 100644
--- a/frontend/src/store/modules/user.js
+++ b/frontend/src/store/modules/user.js
@@ -83,9 +83,12 @@ const actions = {
         commit('SET_TOKEN', data.token)
         commit('SET_LOGIN_MSG', null)
         setToken(data.token)
-        if(data.hasOwnProperty('passwordModified')){
-          commit('SET_PASSWORD_MODIFIED', data.passwordModified)
+        let passwordModified = true
+        if (data.hasOwnProperty('passwordModified')) {
+          passwordModified = data.passwordModified
         }
+        commit('SET_PASSWORD_MODIFIED', passwordModified)
+        localStorage.setItem('passwordModified', passwordModified)
         resolve()
       }).catch(error => {
         reject(error)