diff --git a/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
index e0c6450..4a7d47e 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
@@ -67,7 +67,7 @@ fun EmailSignupScreen() {
             email.isEmpty() -> context.getString(R.string.text_error_email_required)
             // 邮箱格式
             !android.util.Patterns.EMAIL_ADDRESS.matcher(email)
-                .matches() -> context.getString(R.string.text_error_email_format)
+                .matches() -> context.getString(R.string.text_error_email_format_1)
 
             else -> null
         }
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt
index 9b9b0e4..8cb7fea 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt
@@ -72,8 +72,17 @@ fun UserAuthScreen() {
     var passwordError by remember { mutableStateOf<String?>(null) }
     var captchaInfo by remember { mutableStateOf<CaptchaInfo?>(null) }
     fun validateForm(): Boolean {
-        emailError =
-            if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
+        // 如果密码为空，先检查邮箱格式
+        if (password.isEmpty()) {
+            emailError = when {
+                email.isEmpty() -> context.getString(R.string.text_error_email_required)
+                !android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches() -> 
+                    context.getString(R.string.text_error_email_format)
+                else -> null
+            }
+        } else {
+            emailError = if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
+        }
         
         // 使用通用密码校验器
         val passwordValidation = PasswordValidator.validateCurrentPassword(password, context)
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9c5838d..f054f36 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -39,6 +39,7 @@
     <string name="login_confirm_password_label">パスワードの確認</string>
     <string name="agree_terms_of_service">はい、RaveNowのプライバシーポリシーを読み、同意します。</string>
     <string name="agree_promotion">はい、Rave Nowのメーリングリストに追加されたいです。</string>
+    <string name="text_error_email_format_1">メールボックスフォーマットエラー</string>
     <string name="text_error_email_format">無効なメールアドレス</string>
     <string name="text_error_password_format">6文字以上で、文字と数字を含めてください。</string>
     <string name="text_error_confirm_password_mismatch">入力されたパスワードが一致していることを確認してください。</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index e4eecf9..6819fc1 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -38,7 +38,8 @@
     <string name="login_confirm_password_label">再次输入密码</string>
     <string name="agree_terms_of_service">我已阅读用户协议</string>
     <string name="agree_promotion">我同意 Rave Now 推送消息</string>
-    <string name="text_error_email_format">邮箱格式错误</string>
+    <string name="text_error_email_format_1">邮箱格式错误</string>
+    <string name="text_error_email_format">无效的邮箱</string>
     <string name="text_error_password_format">至少6位，包含字母、数字</string>
     <string name="text_error_confirm_password_mismatch">密码和确认密码必须相同</string>
     <string name="text_error_confirm_password_required">请输入确认密码</string>
@@ -149,11 +150,11 @@
     <string name="chat_group">群聊</string>
     <string name="chat_friend">朋友</string>
     <string name="chat_all">全部</string>
-    <string name="favourites_null">暂无数据</string>
+    <string name="favourites_null">咦，什么都没有...</string>
 
     <string name="agent_chat_list_title">智能体聊天</string>
-    <string name="agent_chat_empty_title">AI们在等你开启第一句对话</string>
-    <string name="agent_chat_empty_subtitle">去首页探索一下，主动发起一场对话！</string>
+    <string name="agent_chat_empty_title">AI 在等你的开场白</string>
+    <string name="agent_chat_empty_subtitle">去首页探索一下，主动发起对话！</string>
     <string name="agent_chat_me_prefix">我: </string>
     <string name="agent_chat_image">[图片]</string>
     <string name="agent_chat_voice">[语音]</string>
@@ -163,12 +164,12 @@
     <string name="agent_chat_load_failed">加载失败</string>
     <string name="agent_chat_load_more_failed">加载更多失败</string>
     <string name="agent_chat_user_info_failed">获取用户信息失败: %s</string>
-    <string name="group_chat_empty">没有群聊消息的宇宙太安静了</string>
+    <string name="group_chat_empty">没有群聊，宇宙好安静</string>
     <string name="group_chat_empty_title">没有群聊消息的宇宙太安静了</string>
     <string name="group_chat_empty_subtitle">在首页探索感兴趣的主题房间</string>
-    <string name="group_chat_empty_join">去首页探索感兴趣的主题房间</string>
-    <string name="friend_chat_empty_title">你和朋友，还没说第一句话呢</string>
-    <string name="friend_chat_empty_subtitle">一段崭新的友谊 等待被唤醒</string>
+    <string name="group_chat_empty_join">去首页探索感兴趣的高能对话</string>
+    <string name="friend_chat_empty_title">和朋友，还没有对话哦～</string>
+    <string name="friend_chat_empty_subtitle">点击好友头像，即刻发起聊天</string>
     <string name="friend_chat_me_prefix">我: </string>
     <string name="friend_chat_load_failed">加载失败</string>
     <string name="create_group_chat">创建群聊</string>
@@ -285,10 +286,4 @@
     <string name="group_chat_info_done">完成</string>
     <string name="group_chat_info_recharge_hint">可通过充值获得更多派币</string>
 
-    <!-- Edit Profile Extras -->
-    <string name="mbti_type">MBTI 类型</string>
-    <string name="zodiac">星座</string>
-    <string name="save">保存</string>
-    <string name="choose_mbti">选择 MBTI</string>
-    <string name="choose_zodiac">选择星座</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d29b9e..b5de431 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="login_confirm_password_label">Confirm password</string>
     <string name="agree_terms_of_service">Yes, I have read and agree to RaveNow’s Privacy Policy.</string>
     <string name="agree_promotion">Yes, I want to be added to the Rave Now mailing list.</string>
+    <string name="text_error_email_format_1">Email format error</string>
     <string name="text_error_email_format">Invalid email</string>
     <string name="text_error_password_format">At least 6 characters and contain letters, and numbers.</string>
     <string name="text_error_confirm_password_mismatch">Please ensure that the passwords entered twice are consistent.</string>