diff --git a/packages/better-auth/src/plugins/phone-number/index.ts b/packages/better-auth/src/plugins/phone-number/index.ts
index 53fbacdd22..e553b4f20e 100644
--- a/packages/better-auth/src/plugins/phone-number/index.ts
+++ b/packages/better-auth/src/plugins/phone-number/index.ts
@@ -175,22 +175,9 @@ export const phoneNumber = (options?: {
 						options?.phoneNumberValidator &&
 						!options.phoneNumberValidator(ctx.body.phoneNumber)
 					) {
-						return ctx.json(
-							{
-								user: null,
-								session: null,
-								error: {
-									message: "Invalid phone number",
-								},
-							},
-							{
-								status: 400,
-								body: {
-									message: "Invalid phone number",
-									status: 400,
-								},
-							},
-						);
+						throw new APIError("BAD_REQUEST", {
+							message: "Invalid phone number",
+						});
 					}
 
 					const existing = await ctx.context.adapter.findOne<User>({
@@ -203,22 +190,9 @@ export const phoneNumber = (options?: {
 						],
 					});
 					if (existing) {
-						return ctx.json(
-							{
-								user: null,
-								session: null,
-								error: {
-									message: "Phone number already exists",
-								},
-							},
-							{
-								status: 400,
-								body: {
-									message: "Phone number already exists",
-									status: 400,
-								},
-							},
-						);
+						throw new APIError("BAD_REQUEST", {
+							message: "Phone number already exists",
+						});
 					}
 					try {
 						const res = await signUpEmail({
@@ -361,9 +335,12 @@ export const phoneNumber = (options?: {
 							message: "User with phone number not found",
 						});
 					}
-					await ctx.context.internalAdapter.updateUser(user.id, {
-						[opts.phoneNumberVerified]: true,
-					});
+					const updatedUser = await ctx.context.internalAdapter.updateUser(
+						user.id,
+						{
+							[opts.phoneNumberVerified]: true,
+						},
+					);
 					if (options?.enableAutoSignIn) {
 						const session = await getSessionFromCtx(ctx);
 						if (!session) {
@@ -372,24 +349,21 @@ export const phoneNumber = (options?: {
 								ctx.request,
 							);
 							if (!session) {
-								return ctx.json(null, {
-									status: 500,
-									body: {
-										message: "Failed to create session",
-										status: 500,
-									},
+								throw new APIError("INTERNAL_SERVER_ERROR", {
+									message: "Failed to create session",
 								});
 							}
 							await setSessionCookie(ctx, session.id);
 							return ctx.json({
-								user,
+								user: updatedUser,
 								session,
 							});
 						}
 					}
 
 					return ctx.json({
-						status: true,
+						user: updatedUser,
+						session: null,
 					});
 				},
 			),
diff --git a/packages/better-auth/src/plugins/phone-number/phone-number.test.ts b/packages/better-auth/src/plugins/phone-number/phone-number.test.ts
index 934ffa49f4..ec49c4f7fe 100644
--- a/packages/better-auth/src/plugins/phone-number/phone-number.test.ts
+++ b/packages/better-auth/src/plugins/phone-number/phone-number.test.ts
@@ -6,6 +6,7 @@ import { phoneNumberClient } from "./client";
 
 describe("phone-number", async (it) => {
 	let otp = "";
+
 	const { customFetchImpl, sessionSetter } = await getTestInstance({
 		plugins: [
 			phoneNumber({
@@ -147,4 +148,41 @@ describe("phone-number", async (it) => {
 		});
 		expect(res.error?.status).toBe(400);
 	});
+
+	it("should work with custom config", async () => {
+		let otpCode = "";
+		const { auth } = await getTestInstance({
+			plugins: [
+				phoneNumber({
+					otp: {
+						sendOTPonSignUp: true,
+						otpLength: 4,
+						async sendOTP(_, code) {
+							otpCode = code;
+						},
+						expiresIn: 120,
+					},
+				}),
+			],
+		});
+		await auth.api.signUpPhoneNumber({
+			body: {
+				email: "test@email.com",
+				phoneNumber: "+25120201212",
+				password: "password",
+				name: "test",
+			},
+		});
+
+		expect(otpCode).toHaveLength(4);
+		vi.useFakeTimers();
+		vi.advanceTimersByTime(1000 * 60 * 2);
+		const res = await auth.api.verifyPhoneNumber({
+			body: {
+				phoneNumber: "+25120201212",
+				code: otpCode,
+			},
+		});
+		expect(res.user);
+	});
 });