diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 07050c325920a47687448ee3e1317139d4102dd6..70935ad8ce316cfed6c1fbec851f701e4eb06394 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -57,7 +57,7 @@
     </el-dialog>
 
     <!--Change personal password-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" left>
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" :before-close='closeDialog' left  >
       <el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">
           <el-input v-model="ruleForm.password" autocomplete="off" show-password/>
@@ -68,7 +68,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
            <ms-dialog-footer
-             @cancel="editPasswordVisible = false"
+             @cancel="cancel()"
              @confirm="updatePassword('editPasswordForm')"/>
         </span>
     </el-dialog>
@@ -156,6 +156,16 @@
       editPassword(row) {
         this.editPasswordVisible = true;
       },
+      cancel(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
+      closeDialog(){
+        this.editPasswordVisible = false;
+        this.ruleForm.password="";
+        this.ruleForm.newpassword="";
+      },
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valid => {
           if (valid) {