diff --git a/apps/web/app/ErrorWrapper.tsx b/apps/web/app/ErrorWrapper.tsx
index ddd1228..1e02e9e 100644
--- a/apps/web/app/ErrorWrapper.tsx
+++ b/apps/web/app/ErrorWrapper.tsx
@@ -2,7 +2,7 @@
 
 import { Suspense } from 'react';
 
-import ErrorContent from '@/components/ErrorContnet';
+import ErrorContent from '@/components/ErrorContent';
 
 export default function ErrorWrapper({ children }: { children: React.ReactNode }) {
   return (
diff --git a/apps/web/app/Sidebar.tsx b/apps/web/app/Sidebar.tsx
index 265a079..0789bf6 100644
--- a/apps/web/app/Sidebar.tsx
+++ b/apps/web/app/Sidebar.tsx
@@ -71,8 +71,8 @@ export default function Sidebar() {
         </SheetHeader>
         <div className="space-y-6">
           <div className="flex flex-col items-center space-y-2">
-            <div className="bg-primary text-primary-foreground flex h-16 w-16 items-center justify-center rounded-full text-xl font-bold">
-              {user?.nickname.slice(0, 3)}
+            <div className="bg-primary text-primary-foreground flex h-24 w-24 items-center justify-center rounded-full text-xl font-bold">
+              {user?.nickname.slice(0, 4)}
             </div>
             <div className="w-full text-center">
               <div className="relative flex w-full items-center justify-center gap-2 font-medium">
diff --git a/apps/web/app/components/ErrorContnet.tsx b/apps/web/app/components/ErrorContent.tsx
similarity index 88%
rename from apps/web/app/components/ErrorContnet.tsx
rename to apps/web/app/components/ErrorContent.tsx
index 0cd1b86..7c04db0 100644
--- a/apps/web/app/components/ErrorContnet.tsx
+++ b/apps/web/app/components/ErrorContent.tsx
@@ -12,13 +12,13 @@ export default function ErrorContent({ children }: { children: React.ReactNode }
     const errorDescription = searchParams.get('error_description');
 
     if (error) {
-      const errorMessage = {
+      const message = {
         code: errorCode || 'unknown',
         message: errorDescription?.replace(/\+/g, ' ') || '인증 오류가 발생했습니다.',
         type: error,
       };
 
-      throw new Error(JSON.stringify(errorMessage));
+      throw new Error(JSON.stringify(message));
     }
   }, [searchParams]);
 
diff --git a/apps/web/app/error.tsx b/apps/web/app/error.tsx
index e1403e6..7fd9a80 100644
--- a/apps/web/app/error.tsx
+++ b/apps/web/app/error.tsx
@@ -26,7 +26,7 @@ interface AuthError {
 }
 
 export default function Error({ error }: ErrorPageProps) {
-  const errorMessage = error.message;
+  const message = error.message;
   let errorDetails: AuthError | null = null;
   let isAuthError = false;
 
@@ -66,7 +66,7 @@ export default function Error({ error }: ErrorPageProps) {
             <AlertDescription>
               {errorDetails
                 ? decodeURIComponent(errorDetails.message)
-                : errorMessage || '서버에서 오류가 발생했습니다.'}
+                : message || '서버에서 오류가 발생했습니다.'}
             </AlertDescription>
           </Alert>
 
diff --git a/apps/web/app/error/page.tsx b/apps/web/app/error/page.tsx
index 33dc9c7..3d09e6d 100644
--- a/apps/web/app/error/page.tsx
+++ b/apps/web/app/error/page.tsx
@@ -4,15 +4,13 @@ import { useSearchParams } from 'next/navigation';
 
 export default function ErrorPage() {
   const searchParams = useSearchParams();
-  const errorMessage = searchParams.get('message');
+  const message = searchParams.get('message');
 
   return (
     <div className="error-container">
       <h1>인증 오류</h1>
       <div className="error-content">
-        <p className="error-message">
-          {errorMessage ? errorMessage : '알 수 없는 오류가 발생했습니다.'}
-        </p>
+        <p className="error-message">{message ? message : '알 수 없는 오류가 발생했습니다.'}</p>
         <div className="error-actions">
           <button onClick={() => (window.location.href = '/login')} className="retry-button">
             로그인 페이지로 돌아가기
diff --git a/apps/web/app/library/stats/page.tsx b/apps/web/app/library/stats/page.tsx
index 6a1ff55..d6e6f6e 100644
--- a/apps/web/app/library/stats/page.tsx
+++ b/apps/web/app/library/stats/page.tsx
@@ -13,8 +13,6 @@ export default function StatsPage() {
 
   const { userStat } = useUserStat();
 
-  console.log('userStat', userStat);
-
   return (
     <div className="bg-background h-full py-8">
       <div className="mb-6 flex items-center">
diff --git a/apps/web/app/login/page.tsx b/apps/web/app/login/page.tsx
index ca0907a..28bdbee 100644
--- a/apps/web/app/login/page.tsx
+++ b/apps/web/app/login/page.tsx
@@ -26,14 +26,14 @@ export default function LoginPage() {
 
   const handleLogin = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    const { isSuccess, errorTitle, errorMessage } = await login(email, password);
+    const { isSuccess, title, message } = await login(email, password);
     if (isSuccess) {
       checkAuth();
       router.push('/');
     } else {
       openMessage({
-        title: errorTitle,
-        message: errorMessage || '로그인 실패',
+        title: title,
+        message: message || '로그인 실패',
         variant: 'error',
       });
     }
diff --git a/apps/web/app/signup/actions.ts b/apps/web/app/signup/actions.ts
index de4d1ae..d07541d 100644
--- a/apps/web/app/signup/actions.ts
+++ b/apps/web/app/signup/actions.ts
@@ -14,7 +14,6 @@ export async function register(email: string, password: string) {
   };
 
   const response = await supabase.auth.signUp(data);
-  console.log('response : ', response);
   if (response.error) {
     // 에러를 클라이언트에 전달
 
diff --git a/apps/web/app/signup/page.tsx b/apps/web/app/signup/page.tsx
index 84cb112..b2eb327 100644
--- a/apps/web/app/signup/page.tsx
+++ b/apps/web/app/signup/page.tsx
@@ -32,19 +32,19 @@ export default function SignupPage() {
       return;
     }
 
-    const { isSuccess, errorTitle, errorMessage } = await register(email, password);
+    const { isSuccess, title, message } = await register(email, password);
 
     if (isSuccess) {
       openMessage({
-        title: '회원가입 성공',
-        message: '입력한 이메일로 인증 메일을 보냈어요.',
+        title: title,
+        message: message,
         variant: 'success',
         onButtonClick: () => router.push('/login'),
       });
     } else {
       openMessage({
-        title: errorTitle,
-        message: errorMessage || '회원가입 실패',
+        title: title,
+        message: message || '회원가입 실패',
         variant: 'error',
       });
     }
diff --git a/apps/web/app/stores/useAuthStore.ts b/apps/web/app/stores/useAuthStore.ts
index acedfb1..d91d05b 100644
--- a/apps/web/app/stores/useAuthStore.ts
+++ b/apps/web/app/stores/useAuthStore.ts
@@ -5,7 +5,7 @@ import { immer } from 'zustand/middleware/immer';
 
 import createClient from '@/lib/supabase/client';
 import { User } from '@/types/user';
-import { getErrorMessage } from '@/utils/getErrorMessage';
+import { getSupabaseErrorMessage } from '@/utils/getErrorMessage';
 
 import { withLoading } from './middleware';
 
@@ -28,15 +28,15 @@ interface AuthState {
 
   changeNickname: (nickname: string) => Promise<boolean>;
   sendPasswordResetLink: (email: string) => Promise<void>;
-  changePassword: (password: string) => Promise<boolean>;
+  changePassword: (password: string) => Promise<ModalResponseState>;
 }
 
 // useModalStore에서 사용할 데이터를 전달해줘야 할 때의 타입
 // 기본적인 toast 제어는 store 단에서 처리할 계획
 interface ModalResponseState {
   isSuccess: boolean;
-  errorTitle?: string;
-  errorMessage?: string;
+  title: string;
+  message: string;
 }
 
 const useAuthStore = create(
@@ -54,21 +54,24 @@ const useAuthStore = create(
           if (data.user?.identities?.length === 0) {
             return {
               isSuccess: false,
-              errorTitle: '이메일 중복',
-              errorMessage: '이미 가입된 이메일입니다.',
+              title: '이메일 중복',
+              message: '이미 가입된 이메일입니다.',
             };
           }
 
-          toast.success('회원가입 성공', { description: '만나서 반가워요!' });
-          return { isSuccess: true };
+          return {
+            isSuccess: true,
+            title: '회원가입 성공',
+            message: '입력한 이메일로 인증 메일을 보냈어요.',
+          };
         } catch (error) {
           if (error instanceof AuthError) {
-            return getErrorMessage(error.code as string);
+            return getSupabaseErrorMessage(error.code as string);
           }
           return {
             isSuccess: false,
-            errorTitle: '회원가입 실패',
-            errorMessage: '회원 가입이 실패했어요.',
+            title: '회원가입 실패',
+            message: '회원 가입이 실패했어요.',
           };
         }
       });
@@ -80,10 +83,10 @@ const useAuthStore = create(
           const { error } = await supabase.auth.signInWithPassword({ email, password });
           if (error) throw error;
           toast.success('로그인 성공', { description: '다시 만나서 반가워요!' });
-          return { isSuccess: true };
+          return { isSuccess: true, title: '로그인 성공', message: '다시 만나서 반가워요!' };
         } catch (error) {
           const { code } = error as AuthError;
-          return getErrorMessage(code as string);
+          return getSupabaseErrorMessage(code as string);
         }
       });
     },
@@ -223,16 +226,16 @@ const useAuthStore = create(
           const { error } = await supabase.auth.updateUser({ password });
           if (error) throw error;
 
-          toast.success('비밀번호 변경 완료', {
-            description: '비밀번호가 성공적으로 변경되었어요.',
-          });
-          return true;
+          return {
+            isSuccess: true,
+            title: '비밀번호 변경 완료',
+            message: '비밀번호가 성공적으로 변경되었어요.',
+          };
         } catch (error) {
-          console.error('비밀번호 변경 실패:', error);
-          toast.error('비밀번호 변경 실패', {
-            description: '비밀번호 변경 중 오류가 발생했어요.',
-          });
-          return false;
+          // console.log(error);
+          // console.log(Object.entries(error));
+          const { code } = error as AuthError;
+          return getSupabaseErrorMessage(code as string);
         }
       });
     },
diff --git a/apps/web/app/update-password/page.tsx b/apps/web/app/update-password/page.tsx
index a52a963..e07b99c 100644
--- a/apps/web/app/update-password/page.tsx
+++ b/apps/web/app/update-password/page.tsx
@@ -46,15 +46,20 @@ export default function UpdatePasswordPage() {
       return;
     }
 
-    const result = await changePassword(password);
-
-    if (result) {
+    const { isSuccess, title, message } = await changePassword(password);
+    if (isSuccess) {
       openMessage({
-        title: '비밀번호 변경 성공',
-        message: '비밀번호가 성공적으로 변경되었어요.',
+        title: title,
+        message: message,
         variant: 'success',
         onButtonClick: () => router.push('/login'),
       });
+    } else {
+      openMessage({
+        title: title,
+        message: message,
+        variant: 'error',
+      });
     }
   };
 
@@ -69,6 +74,7 @@ export default function UpdatePasswordPage() {
       if (session?.user.email) {
         console.log('Current session:', session);
         setStep('reset');
+        toast.success('이메일 인증 확인', { description: '비밀번호를 재설정 해주세요.' });
       }
     };
 
@@ -85,6 +91,7 @@ export default function UpdatePasswordPage() {
       if (event === 'SIGNED_IN') {
         console.log('Password recovery detected');
         setStep('reset');
+        toast.success('이메일 인증 확인', { description: '비밀번호를 재설정 해주세요.' });
       }
     });
 
diff --git a/apps/web/app/update-password/success/page.tsx b/apps/web/app/update-password/success/page.tsx
deleted file mode 100644
index cbaf934..0000000
--- a/apps/web/app/update-password/success/page.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-'use client';
-
-import { AlertCircle, CheckCircle2, Eye, EyeOff, Link } from 'lucide-react';
-import { ArrowLeft } from 'lucide-react';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import { toast } from 'sonner';
-
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import createClient from '@/lib/supabase/client';
-import useAuthStore from '@/stores/useAuthStore';
-import useModalStore from '@/stores/useModalStore';
-
-export default function ResetPasswordSuccessPage() {
-  const [password, setPassword] = useState('');
-  const [confirmPassword, setConfirmPassword] = useState('');
-  const [showPassword, setShowPassword] = useState(false);
-  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
-
-  const { isLoading, changePassword } = useAuthStore();
-  const { openMessage } = useModalStore();
-
-  const router = useRouter();
-  const supabase = createClient();
-
-  const searchParams = useSearchParams();
-
-  const token = searchParams.get('token');
-  const email = searchParams.get('email');
-
-  useEffect(() => {
-    const verifyToken = async () => {
-      if (!token || !email) {
-        alert('유효하지 않은 접근입니다');
-        // router.push('/');
-        return;
-      }
-
-      try {
-        // 토큰을 이용한 세션 생성
-        const { error } = await supabase.auth.verifyOtp({
-          email,
-          token,
-          type: 'email',
-        });
-
-        if (error) throw error;
-      } catch (error) {
-        console.error('인증 오류:', error);
-        alert('유효하지 않은 토큰입니다');
-        // router.push('/');
-      }
-    };
-
-    verifyToken();
-  }, [token, email, router]);
-
-  const handleUpdatePassword = async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    // 비밀번호 일치 여부 확인
-    if (password !== confirmPassword) {
-      toast.error('비밀번호 불일치', {
-        description: '비밀번호를 다시 확인해주세요.',
-      });
-      return;
-    }
-
-    const result = await changePassword(password);
-
-    if (result) {
-      openMessage({
-        title: '비밀번호 변경 성공',
-        message: '비밀번호가 성공적으로 변경되었어요.',
-        variant: 'success',
-        onButtonClick: () => router.push('/login'),
-      });
-    }
-  };
-
-  return (
-    <>
-      <div className="space-y-2 text-center">
-        <h1 className="text-2xl font-bold">비밀번호 재설정</h1>
-        <p className="text-muted-foreground text-sm">새로운 비밀번호를 입력해주세요</p>
-      </div>
-
-      <form onSubmit={handleUpdatePassword} className="space-y-4">
-        <div className="space-y-2">
-          <Label htmlFor="password">새 비밀번호</Label>
-          <div className="relative">
-            <Input
-              id="password"
-              type={showPassword ? 'text' : 'password'}
-              value={password}
-              onChange={e => setPassword(e.target.value)}
-              required
-            />
-            <button
-              type="button"
-              className="text-muted-foreground absolute top-1/2 right-3 -translate-y-1/2 transform"
-              onClick={() => setShowPassword(!showPassword)}
-              aria-label={showPassword ? '비밀번호 숨기기' : '비밀번호 보기'}
-            >
-              {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
-            </button>
-          </div>
-        </div>
-
-        <div className="space-y-2">
-          <Label htmlFor="confirmPassword">비밀번호 확인</Label>
-          <div className="relative">
-            <Input
-              id="confirmPassword"
-              type={showConfirmPassword ? 'text' : 'password'}
-              value={confirmPassword}
-              onChange={e => setConfirmPassword(e.target.value)}
-              required
-              className={
-                confirmPassword &&
-                (password === confirmPassword ? 'border-green-500' : 'border-red-500')
-              }
-            />
-            <button
-              type="button"
-              className="text-muted-foreground absolute top-1/2 right-3 -translate-y-1/2 transform"
-              onClick={() => setShowConfirmPassword(!showConfirmPassword)}
-              aria-label={showConfirmPassword ? '비밀번호 숨기기' : '비밀번호 보기'}
-            >
-              {showConfirmPassword ? <EyeOff size={18} /> : <Eye size={18} />}
-            </button>
-          </div>
-
-          {/* 비밀번호 일치 여부 */}
-          {confirmPassword && (
-            <div className="mt-1 flex items-center text-xs">
-              {password === confirmPassword ? (
-                <>
-                  <CheckCircle2 className="mr-1 h-3 w-3 text-green-500" />
-                  <span className="text-green-500">비밀번호가 일치합니다</span>
-                </>
-              ) : (
-                <>
-                  <AlertCircle className="mr-1 h-3 w-3 text-red-500" />
-                  <span className="text-red-500">비밀번호가 일치하지 않습니다</span>
-                </>
-              )}
-            </div>
-          )}
-        </div>
-
-        <Button type="submit" className="w-full" disabled={isLoading}>
-          {isLoading ? '처리 중...' : '비밀번호 변경'}
-        </Button>
-
-        <div className="text-center">
-          <Link
-            href="/login"
-            className="text-primary flex items-center justify-center text-sm hover:underline"
-          >
-            <ArrowLeft className="mr-1 h-3 w-3" />
-            로그인 페이지로 돌아가기
-          </Link>
-        </div>
-      </form>
-    </>
-  );
-}
diff --git a/apps/web/app/utils/getErrorMessage.ts b/apps/web/app/utils/getErrorMessage.ts
index d1841c0..1ca57c9 100644
--- a/apps/web/app/utils/getErrorMessage.ts
+++ b/apps/web/app/utils/getErrorMessage.ts
@@ -1,41 +1,47 @@
-export const getErrorMessage = (errorCode: string | null) => {
+export const getSupabaseErrorMessage = (errorCode: string | null) => {
   if (!errorCode) {
     return {
       isSuccess: false,
-      errorTitle: '알 수 없는 오류',
-      errorMessage: '회원가입이 실패했어요.',
+      title: '알 수 없는 오류',
+      message: '회원가입이 실패했어요.',
     };
   }
   switch (errorCode) {
     case 'email_address_invalid':
       return {
         isSuccess: false,
-        errorTitle: '유효하지 않은 이메일',
-        errorMessage: '이메일 주소가 올바르지 않아요.',
+        title: '유효하지 않은 이메일',
+        message: '이메일 주소가 올바르지 않아요.',
       };
     case 'weak_password':
       return {
         isSuccess: false,
-        errorTitle: '약한 비밀번호',
-        errorMessage: '비밀번호가 최소 6자 이상이어야 해요.',
+        title: '약한 비밀번호',
+        message: '비밀번호가 최소 6자 이상이어야 해요.',
       };
     case 'email_not_confirmed':
       return {
         isSuccess: false,
-        errorTitle: '인증되지 않은 계정',
-        errorMessage: '이메일 인증이 필요해요.',
+        title: '인증되지 않은 계정',
+        message: '이메일 인증이 필요해요.',
       };
     case 'invalid_credentials':
       return {
         isSuccess: false,
-        errorTitle: '잘못된 정보',
-        errorMessage: '이메일 또는 비밀번호가 일치하지 않아요.',
+        title: '잘못된 정보',
+        message: '이메일 또는 비밀번호가 일치하지 않아요.',
+      };
+    case 'same_password':
+      return {
+        isSuccess: false,
+        title: '동일한 비밀번호',
+        message: '이전 비밀번호와 동일해요.',
       };
     default:
       return {
         isSuccess: false,
-        errorTitle: '알 수 없는 오류',
-        errorMessage: '회원가입이 실패했어요.',
+        title: '알 수 없는 오류',
+        message: '회원가입이 실패했어요.',
       };
   }
 };