diff --git a/ui/src/views/login/ForgotPasswordView.vue b/ui/src/views/login/ForgotPasswordView.vue
index 03c2fd730f8..72409641fce 100644
--- a/ui/src/views/login/ForgotPasswordView.vue
+++ b/ui/src/views/login/ForgotPasswordView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import JSEncrypt from 'jsencrypt'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -29,6 +29,7 @@ const isSubmitting = ref(false)
 const isSendingCode = ref(false)
 const countdown = ref(0)
 let countdownTimer: number | undefined
+const isSendCodeDisabled = computed(() => !forgotPasswordForm.email.trim() || isSendingCode.value || countdown.value > 0)
 
 const validateConfirmPassword = (_rule: unknown, value: string, callback: (error?: Error) => void) => {
   if (!value) {
@@ -136,8 +137,8 @@ onMounted(() => {
       <el-form-item prop="verificationCode">
         <div class="flex w-full gap-3">
           <el-input v-model="forgotPasswordForm.verificationCode" placeholder="请输入验证码" />
-          <el-button plain class="w-35 shrink-0" :disabled="countdown > 0" :loading="isSendingCode" @click="handleSendCode">
-            {{ countdown > 0 ? `${countdown}s` : '获取验证码' }}
+          <el-button plain class="w-35 shrink-0" :disabled="isSendCodeDisabled" :loading="isSendingCode" @click="handleSendCode">
+            {{ countdown > 0 ? `重新发送 (${countdown}s)` : '获取验证码' }}
           </el-button>
         </div>
       </el-form-item>
diff --git a/ui/src/views/system/chat-management/users/import-users/ImportUsersDialog.vue b/ui/src/views/system/chat-management/users/import-users/ImportUsersDialog.vue
index 27189a16089..a02c2c81a49 100644
--- a/ui/src/views/system/chat-management/users/import-users/ImportUsersDialog.vue
+++ b/ui/src/views/system/chat-management/users/import-users/ImportUsersDialog.vue
@@ -32,6 +32,7 @@ const importUsersForm = reactive<ImportUsersForm>({ files: [], syncType: '', use
 const importUsersFormRules: FormRules<ImportUsersForm> = {
   files: [{ required: true, type: 'array', min: 1, message: '请上传文件', trigger: 'change' }],
   syncType: [{ required: true, message: '请选择用户来源', trigger: 'change' }],
+  userGroupId: [{ required: true, message: '请选择用户组', trigger: 'change' }],
 }
 const isLocalFileSource = computed(() => importUsersForm.syncType === LOCAL_FILE_SOURCE)
 const canImport = computed(() => Boolean(importUsersForm.syncType) && (!isLocalFileSource.value || importUsersForm.files.length > 0))
@@ -186,7 +187,7 @@ defineExpose({ open })
         />
       </el-form-item>
 
-      <el-form-item label="用户组">
+      <el-form-item label="用户组" prop="userGroupId">
         <el-select
           v-model="importUsersForm.userGroupId"
           class="w-full"