diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4229b463..9ce11fc3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -29,10 +29,10 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">Edit Info</span>
+                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">Log Out</span>
+                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index fa36de65..e09e4f0b 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -26,6 +26,7 @@ export default {
             if (res.IsSuccess) {
               let msg = this.$t('system:userlist:message:ResetPassword2')
               msg = msg.replace('xxx', this.$route.query.userName)
+              msg = msg.replace('yyy', this.$route.query.email)
               this.$alert(msg)
             }
           })
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 4582db64..e126cfd6 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -38,7 +38,7 @@
         <el-input v-model="user.Phone" />
       </el-form-item>
       <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
-        <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" />
+        <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-switch v-model="user.IsTestUser" />
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 950dab35..8ce40a31 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -291,7 +291,7 @@ export default {
     },
     // 编辑用户
     handleEditUser(data) {
-      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName }})
+      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName, email: data.EMail }})
     },
     // 删除用户
     handleDeleteUser(data) {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 615e80c7..550b2585 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -5,7 +5,7 @@
     </div>
       <div class="workbench-content" style="height: 100%">
         <div style="height: 100%;position: relative">
-          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}">
+          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">
             {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
           </div>
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
@@ -180,7 +180,7 @@ export default {
 <style lang="scss">
 .workbench-container{
   .el-tabs__nav{
-    transform: translateY(40px)!important;
+    transform: translateY(60px)!important;
   }
   .el-tabs__header{
     position: relative;