diff --git a/demo/nextjs/app/dashboard/organization-card.tsx b/demo/nextjs/app/dashboard/organization-card.tsx
index 70ad770189..8f69568fa8 100644
--- a/demo/nextjs/app/dashboard/organization-card.tsx
+++ b/demo/nextjs/app/dashboard/organization-card.tsx
@@ -74,7 +74,7 @@ export function OrganizationCard(props: { session: Session | null }) {
   );
 
   return (
-    <Card className="rounded-none md:rounded-sm !bg-none border-none">
+    <Card>
       <CardHeader>
         <CardTitle>Organization</CardTitle>
         <div className="flex justify-between">
diff --git a/demo/nextjs/app/dashboard/page.tsx b/demo/nextjs/app/dashboard/page.tsx
index 868a1e3427..6ab96af7c5 100644
--- a/demo/nextjs/app/dashboard/page.tsx
+++ b/demo/nextjs/app/dashboard/page.tsx
@@ -1,27 +1,29 @@
-import { auth } from "@/lib/auth"
-import { headers } from "next/headers"
-import { redirect } from "next/navigation"
-import UserCard from "./user-card"
-import { OrganizationCard } from "./organization-card"
-
+import { auth } from "@/lib/auth";
+import { headers } from "next/headers";
+import { redirect } from "next/navigation";
+import UserCard from "./user-card";
+import { OrganizationCard } from "./organization-card";
 
 export default async function DashboardPage() {
-    const [session, activeSessions] = await Promise.all([
-        auth.api.getSession({
-            headers: headers()
-        }),
-        auth.api.listSessions({
-            headers: headers()
-        })
-    ]).catch(e => {
-        throw redirect("/sign-in")
-    })
-    return (
-        <div className="w-full">
-            <div className="flex gap-4 flex-col">
-                <UserCard session={JSON.parse(JSON.stringify(session))} activeSessions={JSON.parse(JSON.stringify(activeSessions))} />
-                <OrganizationCard session={JSON.parse(JSON.stringify(session))} />
-            </div>
-        </div>
-    )
-}
\ No newline at end of file
+  const [session, activeSessions] = await Promise.all([
+    auth.api.getSession({
+      headers: headers(),
+    }),
+    auth.api.listSessions({
+      headers: headers(),
+    }),
+  ]).catch((e) => {
+    throw redirect("/sign-in");
+  });
+  return (
+    <div className="w-full">
+      <div className="flex gap-4 flex-col">
+        <UserCard
+          session={JSON.parse(JSON.stringify(session))}
+          activeSessions={JSON.parse(JSON.stringify(activeSessions))}
+        />
+        <OrganizationCard session={JSON.parse(JSON.stringify(session))} />
+      </div>
+    </div>
+  );
+}
diff --git a/demo/nextjs/app/dashboard/user-card.tsx b/demo/nextjs/app/dashboard/user-card.tsx
index 0b993e4b2b..413e371f57 100644
--- a/demo/nextjs/app/dashboard/user-card.tsx
+++ b/demo/nextjs/app/dashboard/user-card.tsx
@@ -89,7 +89,7 @@ export default function UserCard(props: {
   const [isSignOut, setIsSignOut] = useState<boolean>(false);
 
   return (
-    <Card className="rounded-none md:rounded-sm !bg-none border-none">
+    <Card>
       <CardHeader>
         <CardTitle>User</CardTitle>
       </CardHeader>
@@ -407,6 +407,7 @@ function ChangePassword() {
                 toast.error("Passwords do not match");
                 return;
               }
+              a;
               if (newPassword.length < 8) {
                 toast.error("Password must be at least 8 characters");
                 return;
diff --git a/demo/nextjs/lib/auth-client.ts b/demo/nextjs/lib/auth-client.ts
index dd3973580c..5a87c355f2 100644
--- a/demo/nextjs/lib/auth-client.ts
+++ b/demo/nextjs/lib/auth-client.ts
@@ -4,6 +4,7 @@ import {
 	passkeyClient,
 	twoFactorClient,
 } from "better-auth/client/plugins";
+import { toast } from "sonner";
 
 export const client = createAuthClient({
 	plugins: [
@@ -14,7 +15,11 @@ export const client = createAuthClient({
 		passkeyClient(),
 	],
 	fetchOptions: {
-		credentials: "include",
+		onError(e) {
+			if (e.error.status === 429) {
+				toast.error("Too many requests. Please try again later.");
+			}
+		},
 	},
 });
 
diff --git a/demo/nextjs/lib/auth.ts b/demo/nextjs/lib/auth.ts
index 646312d69e..f43a39b0f4 100644
--- a/demo/nextjs/lib/auth.ts
+++ b/demo/nextjs/lib/auth.ts
@@ -41,6 +41,8 @@ export const auth = betterAuth({
 	plugins: [
 		rateLimiter({
 			enabled: true,
+
+			max: 1000,
 		}),
 		organization({
 			async sendInvitationEmail(data) {
diff --git a/packages/better-auth/src/api/routes/session.ts b/packages/better-auth/src/api/routes/session.ts
index ebed09228b..c2f543eb33 100644
--- a/packages/better-auth/src/api/routes/session.ts
+++ b/packages/better-auth/src/api/routes/session.ts
@@ -51,7 +51,6 @@ export const getSession = <Option extends BetterAuthOptions>() =>
 			requireHeaders: true,
 		},
 		async (ctx) => {
-			console.log("called");
 			try {
 				const sessionCookieToken = await ctx.getSignedCookie(
 					ctx.context.authCookies.sessionToken.name,
@@ -213,7 +212,6 @@ export const revokeSession = createAuthEndpoint(
 	},
 	async (ctx) => {
 		const id = ctx.body.id;
-		console.log(id);
 		try {
 			await ctx.context.internalAdapter.deleteSession(id);
 		} catch (error) {
diff --git a/packages/better-auth/src/client/config.ts b/packages/better-auth/src/client/config.ts
index de2d47d71c..a463132d6f 100644
--- a/packages/better-auth/src/client/config.ts
+++ b/packages/better-auth/src/client/config.ts
@@ -20,6 +20,7 @@ export const getClientConfig = <O extends ClientOptions>(options?: O) => {
 				.filter((pl) => pl !== undefined) || []),
 		],
 	});
+
 	const plugins = options?.plugins || [];
 	let pluginsActions = {} as Record<string, any>;
 	let pluginsAtoms = {} as Record<string, Atom<any>>;
diff --git a/packages/better-auth/src/client/fetch-plugins.ts b/packages/better-auth/src/client/fetch-plugins.ts
index ecde19108e..193080eefd 100644
--- a/packages/better-auth/src/client/fetch-plugins.ts
+++ b/packages/better-auth/src/client/fetch-plugins.ts
@@ -61,11 +61,17 @@ export const csrfPlugin = {
 							"CSRF route not found. Make sure the server is running and the base URL is correct and includes the path (e.g. http://localhost:3000/api/auth).",
 						);
 					}
+
 					if (error.status === 429) {
-						return new Response(null, {
-							status: 429,
-							statusText: "Too Many Requests",
-						});
+						return new Response(
+							JSON.stringify({
+								message: "Too many requests. Please try again later.",
+							}),
+							{
+								status: 429,
+								statusText: "Too Many Requests",
+							},
+						);
 					}
 					throw new BetterAuthError(
 						"Failed to fetch CSRF token: " + error.message,
diff --git a/packages/better-auth/src/plugins/rate-limiter/index.ts b/packages/better-auth/src/plugins/rate-limiter/index.ts
index cbfddce049..e71e6fc2d5 100644
--- a/packages/better-auth/src/plugins/rate-limiter/index.ts
+++ b/packages/better-auth/src/plugins/rate-limiter/index.ts
@@ -207,22 +207,27 @@ export const rateLimiter = (options: RateLimitOptions) => {
 						rateLimit.lastRequest >= windowStart &&
 						rateLimit.count >= opts.max
 					) {
-						return new Response(null, {
-							status: 429,
-							statusText: "Too Many Requests",
-							headers: {
-								"X-RateLimit-Window": opts.window.toString(),
-								"X-RateLimit-Max": opts.max.toString(),
-								"X-RateLimit-Remaining": (
-									opts.max - rateLimit.count
-								).toString(),
-								"X-RateLimit-Reset": (
-									rateLimit.lastRequest +
-									opts.window * 1000 -
-									now
-								).toString(),
+						return new Response(
+							JSON.stringify({
+								message: "Too many requests. Please try again later.",
+							}),
+							{
+								status: 429,
+								statusText: "Too Many Requests",
+								headers: {
+									"X-RateLimit-Window": opts.window.toString(),
+									"X-RateLimit-Max": opts.max.toString(),
+									"X-RateLimit-Remaining": (
+										opts.max - rateLimit.count
+									).toString(),
+									"X-RateLimit-Reset": (
+										rateLimit.lastRequest +
+										opts.window * 1000 -
+										now
+									).toString(),
+								},
 							},
-						});
+						);
 					}
 
 					if (rateLimit.lastRequest < windowStart) {
diff --git a/todo.md b/todo.md
index dbc4306134..eb56bf3df1 100644
--- a/todo.md
+++ b/todo.md
@@ -12,6 +12,7 @@
 [x] fix the issue with the client triggers not working fot 2 consecutive calls
 [ ] add a way to specify on the client to use the base path as the whole path
 [x] implement magic links
+[ ] rate limiter error handling
 
 
 ## Docs