diff --git a/Assets/Scripts/UI/Pages/Login/SubPages/SetPasswordPanel.cs b/Assets/Scripts/UI/Pages/Login/SubPages/SetPasswordPanel.cs
index 6f2e8bb..9c128b6 100644
--- a/Assets/Scripts/UI/Pages/Login/SubPages/SetPasswordPanel.cs
+++ b/Assets/Scripts/UI/Pages/Login/SubPages/SetPasswordPanel.cs
@@ -162,6 +162,14 @@ namespace Kill.UI.Pages
             string newPwd = newPasswordInput != null ? newPasswordInput.text : "";
             string confirmPwd = confirmPasswordInput != null ? confirmPasswordInput.text : "";
 
+            // 密码为空时，所有规则显示错误
+            if (string.IsNullOrEmpty(newPwd))
+            {
+                ResetRulesDisplay();
+                isConfirmEnabled = false;
+                return;
+            }
+
             bool pwdRulesValid = false;
 
             if (passwordType == 0)
diff --git a/Assets/Scripts/UI/Pages/SelfPage/SelfSetPasswordPanel.cs b/Assets/Scripts/UI/Pages/SelfPage/SelfSetPasswordPanel.cs
index 7734f30..d05d4d1 100644
--- a/Assets/Scripts/UI/Pages/SelfPage/SelfSetPasswordPanel.cs
+++ b/Assets/Scripts/UI/Pages/SelfPage/SelfSetPasswordPanel.cs
@@ -146,6 +146,14 @@ namespace Kill.UI.Pages
             string newPwd = newPasswordInput != null ? newPasswordInput.text : "";
             string confirmPwd = confirmPasswordInput != null ? confirmPasswordInput.text : "";
 
+            // 密码为空时，所有规则显示错误
+            if (string.IsNullOrEmpty(newPwd))
+            {
+                ResetRulesDisplay();
+                isConfirmEnabled = false;
+                return;
+            }
+
             bool pwdRulesValid = false;
 
             if (passwordType == 0)
diff --git a/Assets/Scripts/Utils/ValidationUtils.cs b/Assets/Scripts/Utils/ValidationUtils.cs
index 6a50839..5a7723d 100644
--- a/Assets/Scripts/Utils/ValidationUtils.cs
+++ b/Assets/Scripts/Utils/ValidationUtils.cs
@@ -107,7 +107,7 @@ namespace Kill.Utils
         {
             if (string.IsNullOrEmpty(email)) return true;
 
-            string emailName = email.Contains('@') ? email.Split('@')[0] : email;
+            string emailName = email;
             string pwdLower = password.ToLower();
 
             for (int i = 0; i <= emailName.Length - 2; i++)