diff --git a/src/app/invite/[id]/page.tsx b/src/app/invite/[id]/page.tsx
index 817475a..15bed4c 100644
--- a/src/app/invite/[id]/page.tsx
+++ b/src/app/invite/[id]/page.tsx
@@ -29,6 +29,7 @@ export default function InvitePage() {
   const [userCount, setUserCount] = useState(0);
   const [scene, setScene] = useState<SceneType>("eat");
   const [joining, setJoining] = useState(false);
+  const [joinError, setJoinError] = useState("");
 
   const sceneConfig = getSceneConfig(scene);
 
@@ -48,10 +49,12 @@ export default function InvitePage() {
 
   const handleJoin = async () => {
     setJoining(true);
+    setJoinError("");
     try {
       await joinRoom(roomId, getUserId());
       router.push(`/room/${roomId}`);
-    } catch {
+    } catch (e) {
+      setJoinError(e instanceof Error ? e.message : "加入失败，请重试");
       setJoining(false);
     }
   };
@@ -187,6 +190,15 @@ export default function InvitePage() {
         animate={{ y: 0, opacity: 1 }}
         transition={{ duration: 0.5, delay: 0.3 }}
       >
+        {joinError && (
+          <motion.p
+            className="mb-3 text-center text-xs font-medium text-rose-400"
+            initial={{ opacity: 0, y: -4 }}
+            animate={{ opacity: 1, y: 0 }}
+          >
+            {joinError}
+          </motion.p>
+        )}
         <Button
           onClick={handleJoin}
           size="lg"
diff --git a/src/components/AuthModal.tsx b/src/components/AuthModal.tsx
index 34a5ee8..d03e089 100644
--- a/src/components/AuthModal.tsx
+++ b/src/components/AuthModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { motion } from "framer-motion";
 import { X, Eye, EyeOff } from "lucide-react";
 import { AVATARS } from "@/lib/avatars";
@@ -36,8 +36,17 @@ export default function AuthModal({ open, onClose, onAuth, defaultTab = "login"
     setAvatar(AVATARS[0].emoji);
     setShowPassword(false);
     setError("");
+    setLoading(false);
   };
 
+  useEffect(() => {
+    if (open) {
+      setTab(defaultTab);
+      resetForm();
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
+
   const switchTab = (t: Tab) => {
     setTab(t);
     resetForm();