diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index 663adca0..c015240f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -84,6 +84,7 @@ public class ShiroConfig {
         filterMap.put("/user/login", "anon");
         filterMap.put("/user/pub-config", "anon");
         filterMap.put("/user/register", "anon");
+        filterMap.put("/user/retrieve-password", "anon");
         // 将config路径使用server服务过滤器
         filterMap.put("/config/**", "server");
         filterMap.put("/agent/chat-history/report", "server");
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
index d0d84e66..47fd7b1b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java
@@ -174,19 +174,19 @@ public class LoginController {
         // 验证用户是否是手机号码
         boolean validPhone = ValidatorUtils.isValidPhone(dto.getPhone());
         if (!validPhone) {
-            throw new RenException("用户名不是手机号码，无法提供找回密码服务");
+            throw new RenException("输入的手机号码格式不正确");
         }
 
         // 按照用户名获取用户
         SysUserDTO userDTO = sysUserService.getByUsername(dto.getPhone());
         if (userDTO == null) {
-            throw new RenException("用户名或验证码错误");
+            throw new RenException("输入的手机号码未注册");
         }
         // 验证短信验证码是否正常
         boolean validate = captchaService.validateSMSValidateCode(dto.getPhone(), dto.getCode(), false);
         // 判断是否通过验证
         if (!validate) {
-            throw new RenException("用户名或验证码错误");
+            throw new RenException("输入的手机验证码错误");
         }
 
         sysUserService.changePasswordDirectly(userDTO.getId(), dto.getPassword());
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java
index 121e3492..c6f8f490 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java
@@ -119,7 +119,7 @@ public class CaptchaServiceImpl implements CaptchaService {
 
         // 更新今日发送次数
         if (todayCount == 0) {
-            redisUtils.increment(todayCountKey,RedisUtils.DEFAULT_EXPIRE);
+            redisUtils.increment(todayCountKey, RedisUtils.DEFAULT_EXPIRE);
         } else {
             redisUtils.increment(todayCountKey);
         }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
index 54048fe0..9f35836f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
@@ -133,6 +133,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void changePasswordDirectly(Long userId, String password) {
+        // 新密码强度
+        if (!isStrongPassword(password)) {
+            throw new RenException(ErrorCode.PASSWORD_WEAK_ERROR);
+        }
         SysUserEntity sysUserEntity = new SysUserEntity();
         sysUserEntity.setId(userId);
         sysUserEntity.setPassword(PasswordUtils.encode(password));
diff --git a/main/manager-web/src/views/login.vue b/main/manager-web/src/views/login.vue
index 2cc42e45..e31d5180 100644
--- a/main/manager-web/src/views/login.vue
+++ b/main/manager-web/src/views/login.vue
@@ -56,13 +56,13 @@
             <div
               style="font-weight: 400;font-size: 14px;text-align: left;color: #5778ff;display: flex;justify-content: space-between;margin-top: 20px;">
               <div v-if="allowUserRegister" style="cursor: pointer;" @click="goToRegister">新用户注册</div>
-              <div style="cursor: pointer;" @click="goToForgetPassword">忘记密码?</div>
+              <div style="cursor: pointer;" @click="goToForgetPassword" v-if="enableMobileRegister">忘记密码?</div>
             </div>
           </div>
           <div class="login-btn" @click="login">登录</div>
 
           <!-- 登录方式切换按钮 -->
-          <div class="login-type-container">
+          <div class="login-type-container" v-if="enableMobileRegister">
             <el-tooltip content="手机号码登录" placement="bottom">
               <el-button :type="isMobileLogin ? 'primary' : 'default'" icon="el-icon-mobile" circle
                 @click="switchLoginType('mobile')"></el-button>
diff --git a/main/manager-web/src/views/register.vue b/main/manager-web/src/views/register.vue
index 744da3e4..7eac511b 100644
--- a/main/manager-web/src/views/register.vue
+++ b/main/manager-web/src/views/register.vue
@@ -201,6 +201,7 @@ export default {
 
       // 验证图形验证码
       if (!this.validateInput(this.form.captcha, '请输入图形验证码')) {
+        this.fetchCaptcha();
         return;
       }
 
diff --git a/main/manager-web/src/views/retrievePassword.vue b/main/manager-web/src/views/retrievePassword.vue
index 49b8c1e4..9072baae 100644
--- a/main/manager-web/src/views/retrievePassword.vue
+++ b/main/manager-web/src/views/retrievePassword.vue
@@ -24,56 +24,56 @@
             </div>
 
             <div style="padding: 0 30px;">
-                  <!-- 手机号输入 -->
-                  <div class="input-box">
-                    <div style="display: flex; align-items: center; width: 100%;">
-                      <el-select v-model="form.areaCode" style="width: 220px; margin-right: 10px;">
-                        <el-option v-for="item in mobileAreaList" :key="item.key"
-                          :label="`${item.name} (${item.key})`" :value="item.key" />
-                      </el-select>
-                      <el-input v-model="form.mobile" placeholder="请输入手机号码" />
-                    </div>
-                  </div>
-
-                  <div style="display: flex; align-items: center; margin-top: 20px; width: 100%; gap: 10px;">
-                    <div class="input-box" style="width: calc(100% - 130px); margin-top: 0;">
-                      <img loading="lazy" alt="" class="input-icon" src="@/assets/login/shield.png" />
-                      <el-input v-model="form.captcha" placeholder="请输入验证码" style="flex: 1;" />
-                    </div>
-                    <img loading="lazy" v-if="captchaUrl" :src="captchaUrl" alt="验证码"
-                      style="width: 150px; height: 40px; cursor: pointer;" @click="fetchCaptcha" />
-                  </div>
-
-                  <!-- 手机验证码 -->
-                  <div style="display: flex; align-items: center; margin-top: 20px; width: 100%; gap: 10px;">
-                    <div class="input-box" style="width: calc(100% - 130px); margin-top: 0;">
-                      <img loading="lazy" alt="" class="input-icon" src="@/assets/login/phone.png" />
-                      <el-input v-model="form.mobileCaptcha" placeholder="请输入手机验证码" style="flex: 1;" maxlength="6" />
-                    </div>
-                    <el-button type="primary" class="send-captcha-btn" :disabled="!canSendMobileCaptcha"
-                      @click="sendMobileCaptcha">
-                      <span>
-                        {{ countdown > 0 ? `${countdown}秒后重试` : '发送验证码' }}
-                      </span>
-                    </el-button>
-                  </div>
-
-                <!-- 新密码 -->
-                <div class="input-box">
-                  <img loading="lazy" alt="" class="input-icon" src="@/assets/login/password.png" />
-                  <el-input v-model="form.newPassword" placeholder="请输入新密码" type="password" />
+              <!-- 手机号输入 -->
+              <div class="input-box">
+                <div style="display: flex; align-items: center; width: 100%;">
+                  <el-select v-model="form.areaCode" style="width: 220px; margin-right: 10px;">
+                    <el-option v-for="item in mobileAreaList" :key="item.key" :label="`${item.name} (${item.key})`"
+                      :value="item.key" />
+                  </el-select>
+                  <el-input v-model="form.mobile" placeholder="请输入手机号码" />
                 </div>
+              </div>
 
-                <!-- 确认新密码 -->
-                <div class="input-box">
-                  <img loading="lazy" alt="" class="input-icon" src="@/assets/login/password.png" />
-                  <el-input v-model="form.confirmPassword" placeholder="请确认新密码" type="password" />
+              <div style="display: flex; align-items: center; margin-top: 20px; width: 100%; gap: 10px;">
+                <div class="input-box" style="width: calc(100% - 130px); margin-top: 0;">
+                  <img loading="lazy" alt="" class="input-icon" src="@/assets/login/shield.png" />
+                  <el-input v-model="form.captcha" placeholder="请输入验证码" style="flex: 1;" />
                 </div>
+                <img loading="lazy" v-if="captchaUrl" :src="captchaUrl" alt="验证码"
+                  style="width: 150px; height: 40px; cursor: pointer;" @click="fetchCaptcha" />
+              </div>
 
-                <!-- 修改底部链接 -->
-                <div style="font-weight: 400;font-size: 14px;text-align: left;color: #5778ff;margin-top: 20px;">
-                  <div style="cursor: pointer;" @click="goToLogin">返回登录</div>
+              <!-- 手机验证码 -->
+              <div style="display: flex; align-items: center; margin-top: 20px; width: 100%; gap: 10px;">
+                <div class="input-box" style="width: calc(100% - 130px); margin-top: 0;">
+                  <img loading="lazy" alt="" class="input-icon" src="@/assets/login/phone.png" />
+                  <el-input v-model="form.mobileCaptcha" placeholder="请输入手机验证码" style="flex: 1;" maxlength="6" />
                 </div>
+                <el-button type="primary" class="send-captcha-btn" :disabled="!canSendMobileCaptcha"
+                  @click="sendMobileCaptcha">
+                  <span>
+                    {{ countdown > 0 ? `${countdown}秒后重试` : '发送验证码' }}
+                  </span>
+                </el-button>
+              </div>
+
+              <!-- 新密码 -->
+              <div class="input-box">
+                <img loading="lazy" alt="" class="input-icon" src="@/assets/login/password.png" />
+                <el-input v-model="form.newPassword" placeholder="请输入新密码" type="password" />
+              </div>
+
+              <!-- 确认新密码 -->
+              <div class="input-box">
+                <img loading="lazy" alt="" class="input-icon" src="@/assets/login/password.png" />
+                <el-input v-model="form.confirmPassword" placeholder="请确认新密码" type="password" />
+              </div>
+
+              <!-- 修改底部链接 -->
+              <div style="font-weight: 400;font-size: 14px;text-align: left;color: #5778ff;margin-top: 20px;">
+                <div style="cursor: pointer;" @click="goToLogin">返回登录</div>
+              </div>
             </div>
 
             <!-- 修改按钮文本 -->
@@ -171,6 +171,7 @@ export default {
 
       // 验证图形验证码
       if (!this.validateInput(this.form.captcha, '请输入图形验证码')) {
+        this.fetchCaptcha();
         return;
       }
 
@@ -225,18 +226,18 @@ export default {
         return;
       }
 
-      Api.user.resetPassword({
+      Api.user.retrievePassword({
         phone: this.form.areaCode + this.form.mobile,
-        newPassword: this.form.newPassword,
-        smsCode: this.form.mobileCaptcha,
-        captcha: this.form.captcha,
-        captchaId: this.form.captchaId
+        password: this.form.newPassword,
+        code: this.form.mobileCaptcha
       }, (res) => {
         showSuccess('密码重置成功');
         goToPage('/login');
       }, (err) => {
         showDanger(err.data.msg || '重置失败');
-        this.fetchCaptcha();
+        if (err.data != null && err.data.msg != null && err.data.msg.indexOf('图形验证码') > -1) {
+          this.fetchCaptcha()
+        }
       });
     },