diff --git a/app/api/user/login/route.ts b/app/api/user/login/route.ts
index c47f991..71c93f4 100644
--- a/app/api/user/login/route.ts
+++ b/app/api/user/login/route.ts
@@ -39,6 +39,17 @@ export async function POST(request: NextRequest) {
 
         const token = jwt.sign({ id: user.id }, process.env.JWT_SECRET, { expiresIn: body.remember ? "7d" : "1h" });
 
+        const lastLogin = new Date();
+
+        await prisma.user.update({
+            where: {
+                id: user.id,
+            },
+            data: {
+                lastLogin,
+            },
+        });
+
         return NextResponse.json({ message: "Login successful", token }, { status: 200 });
 
     } catch (error: any) {
diff --git a/components/Success.tsx b/components/Success.tsx
new file mode 100644
index 0000000..0bf8fe8
--- /dev/null
+++ b/components/Success.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { useEffect } from "react";
+
+type SuccessToastProps = {
+  message: string;
+  show: boolean;
+  onClose: () => void;
+};
+
+export default function SuccessToast({ message, show, onClose }: SuccessToastProps) {
+  useEffect(() => {
+    if (show) {
+      const timer = setTimeout(() => {
+        onClose();
+      }, 5000);
+      return () => clearTimeout(timer);
+    }
+  }, [show, onClose]);
+
+  if (!show) return null;
+
+  return (
+    <div className="toast toast-end">
+      <div className="alert alert-success alert-soft">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          className="h-6 w-6 shrink-0 stroke-current"
+          fill="none"
+          viewBox="0 0 24 24"
+        >
+          <path
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            strokeWidth="2"
+            d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+          />
+        </svg>
+        <div>
+          <span className="font-bold">SUCCESS: </span>
+          <span>{message}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/settings/PasswordSettings.tsx b/components/settings/PasswordSettings.tsx
index 070e160..e3b0f2f 100644
--- a/components/settings/PasswordSettings.tsx
+++ b/components/settings/PasswordSettings.tsx
@@ -3,11 +3,13 @@
 import { useState } from 'react';
 import axios from 'axios';
 import Cookies from 'js-cookie';
+import SuccessToast from '../Success';
 
 export const PasswordSettings = ({ onError }: { onError: (message: string) => void }) => {
   const [oldPassword, setOldPassword] = useState('');
   const [password, setPassword] = useState('');
   const [passwordConfirm, setPasswordConfirm] = useState('');
+  const [success, setSuccess] = useState('');
 
   const handleSave = async () => {
     if (password !== passwordConfirm) return onError('Passwords do not match');
@@ -23,52 +25,59 @@ export const PasswordSettings = ({ onError }: { onError: (message: string) => vo
       if (response.data.message !== 'Password updated successfully') {
         onError('Failed to update password');
       }
+      setSuccess('Password updated successfully');
+      setOldPassword('');
+      setPassword('');
+      setPasswordConfirm('');
     } catch (error: any) {
       onError(error.response?.data?.error || 'An error occurred');
     }
   };
 
   return (
-    <div className="w-full bg-base-200 p-4 rounded-2xl border border-stone-800">
-      <h2 className="text-lg font-bold">Password Settings</h2>
-      <p className="text-sm opacity-70">Manage your password</p>
-      
-      <div className="flex flex-col gap-4 pt-8">
-        <div className="flex flex-col gap-2">
-          <label htmlFor="oldPassword" className="text-sm font-bold">Old Password</label>
-          <input
-            type="password"
-            id="oldPassword"
-            value={oldPassword}
-            onChange={(e) => setOldPassword(e.target.value)}
-            className="input w-full"
-          />
-        </div>
-        <div className="flex flex-col gap-2">
-          <label htmlFor="password" className="text-sm font-bold">Password</label>
-          <input
-            type="password"
-            id="password"
-            value={password}
-            onChange={(e) => setPassword(e.target.value)}
-            className="input w-full"
-          />
-        </div>
-        <div className="flex flex-col gap-2">
-          <label htmlFor="passwordConfirm" className="text-sm font-bold">Confirm Password</label>
-          <input
-            type="password"
-            id="passwordConfirm"
-            value={passwordConfirm}
-            onChange={(e) => setPasswordConfirm(e.target.value)}
-            className="input w-full"
-          />
+    <div>
+      <div className="w-full bg-base-200 p-4 rounded-2xl border border-stone-800">
+        <h2 className="text-lg font-bold">Password Settings</h2>
+        <p className="text-sm opacity-70">Manage your password</p>
+        
+        <div className="flex flex-col gap-4 pt-8">
+          <div className="flex flex-col gap-2">
+            <label htmlFor="oldPassword" className="text-sm font-bold">Old Password</label>
+            <input
+              type="password"
+              id="oldPassword"
+              value={oldPassword}
+              onChange={(e) => setOldPassword(e.target.value)}
+              className="input w-full"
+            />
+          </div>
+          <div className="flex flex-col gap-2">
+            <label htmlFor="password" className="text-sm font-bold">Password</label>
+            <input
+              type="password"
+              id="password"
+              value={password}
+              onChange={(e) => setPassword(e.target.value)}
+              className="input w-full"
+            />
+          </div>
+          <div className="flex flex-col gap-2">
+            <label htmlFor="passwordConfirm" className="text-sm font-bold">Confirm Password</label>
+            <input
+              type="password"
+              id="passwordConfirm"
+              value={passwordConfirm}
+              onChange={(e) => setPasswordConfirm(e.target.value)}
+              className="input w-full"
+            />
+          </div>
         </div>
+        
+        <button className="btn btn-primary mt-8 w-full" onClick={handleSave}>
+          Save Changes
+        </button>
       </div>
-      
-      <button className="btn btn-primary mt-8 w-full" onClick={handleSave}>
-        Save Changes
-      </button>
+      <SuccessToast message={success} show={success !== ''} onClose={() => setSuccess('')} />
     </div>
   );
 };
\ No newline at end of file