diff --git a/src/api/log.js b/src/api/log.js
index 2b2332f8d..e79548ea4 100644
--- a/src/api/log.js
+++ b/src/api/log.js
@@ -84,7 +84,7 @@ logApi.logTypes = {
   },
   LOGGED_PRE_CHECK: {
     value: 70,
-    text: '登陆验证'
+    text: '登录验证'
   }
 }
 
diff --git a/src/components/Login/LoginForm.vue b/src/components/Login/LoginForm.vue
index dd6eb76d9..9bc307575 100644
--- a/src/components/Login/LoginForm.vue
+++ b/src/components/Login/LoginForm.vue
@@ -5,7 +5,7 @@
       :model="form.model"
       :rules="form.rules"
       layout="vertical"
-      @keyup.enter.native="handleLogin"
+      @keyup.enter.native="form.needAuthCode ? handleLogin() : handleLoginClick()"
     >
       <a-form-model-item
         v-if="!form.needAuthCode"
@@ -112,9 +112,9 @@ export default {
     },
     handleLogin() {
       const _this = this
-      _this.form.logging = true
       _this.$refs.loginForm.validate(valid => {
         if (valid) {
+          _this.form.logging = true
           _this
             .login(_this.form.model)
             .then(() => {
diff --git a/src/views/user/Profile.vue b/src/views/user/Profile.vue
index 088416931..4b8b734d1 100644
--- a/src/views/user/Profile.vue
+++ b/src/views/user/Profile.vue
@@ -468,7 +468,7 @@ export default {
       } else {
         _this.handleCloseMFAuthModal()
         _this.handleLoadStatistics()
-        _this.$message.success(_this.mfaUsed ? '两步验证已关闭！' : '两步验证已开启,下次登陆生效！')
+        _this.$message.success(_this.mfaUsed ? '两步验证已关闭！' : '两步验证已开启,下次登录生效！')
       }
     },
     handleCloseMFAuthModal() {