diff --git a/docs/components/theme-toggler.tsx b/docs/components/theme-toggler.tsx
index 0bc1abd9fe..0d602d5544 100644
--- a/docs/components/theme-toggler.tsx
+++ b/docs/components/theme-toggler.tsx
@@ -23,7 +23,7 @@ export function ThemeToggle(props: ComponentProps<typeof Button>) {
 					aria-label="Toggle Theme"
 					{...props}
 					className={cn(
-						"flex shrink-0 navbar:w-[3.56rem] navbar:h-14 navbar:border-l navbar:text-muted-foreground max-navbar:-mr-1.5 max-navbar:hover:bg-transparent",
+						"flex shrink-0 navbar:w-[3.56rem] navbar:h-14 navbar:border-l navbar:text-muted-foreground max-navbar:-mr-1.5 max-navbar:hover:bg-transparent ",
 						props.className,
 					)}
 				>
@@ -33,6 +33,7 @@ export function ThemeToggle(props: ComponentProps<typeof Button>) {
 							width="1em"
 							height="1em"
 							viewBox="0 0 24 24"
+							className="size-5"
 						>
 							<g
 								fill="none"
@@ -158,7 +159,7 @@ export function ThemeToggle(props: ComponentProps<typeof Button>) {
 					>
 						<path
 							fill="currentColor"
-							d="M9.5 2c-1.82 0-3.53.5-5 1.35c2.99 1.73 5 4.95 5 8.65s-2.01 6.92-5 8.65c1.47.85 3.18 1.35 5 1.35c5.52 0 10-4.48 10-10S15.02 2 9.5 2"
+							d="M11.38 2.019a7.5 7.5 0 1 0 10.6 10.6C21.662 17.854 17.316 22 12.001 22C6.477 22 2 17.523 2 12c0-5.315 4.146-9.661 9.38-9.981"
 						/>
 					</svg>
 				</Button>
diff --git a/packages/better-auth/src/db/internal-adapter.ts b/packages/better-auth/src/db/internal-adapter.ts
index 05f142edd9..ecab3c8225 100644
--- a/packages/better-auth/src/db/internal-adapter.ts
+++ b/packages/better-auth/src/db/internal-adapter.ts
@@ -765,6 +765,7 @@ export const createInternalAdapter = (
 			};
 		},
 		findUserById: async (userId: string) => {
+			if (!userId) return null;
 			const user = await (await getCurrentAdapter(adapter)).findOne<User>({
 				model: "user",
 				where: [
diff --git a/packages/better-auth/src/plugins/open-api/generator.ts b/packages/better-auth/src/plugins/open-api/generator.ts
index d836ceea01..88724bf806 100644
--- a/packages/better-auth/src/plugins/open-api/generator.ts
+++ b/packages/better-auth/src/plugins/open-api/generator.ts
@@ -102,6 +102,7 @@ export type OpenAPIModelSchema = {
 function getFieldSchema(field: DBFieldAttribute) {
 	const schema: FieldSchema = {
 		type: field.type === "date" ? "string" : field.type,
+		...(field.type === "date" && { format: "date-time" }),
 	};
 
 	if (field.defaultValue !== undefined) {