diff --git a/packages/better-auth/src/adapters/drizzle-adapter/drizzle-adapter.ts b/packages/better-auth/src/adapters/drizzle-adapter/drizzle-adapter.ts
index ea380a11de..47b7afde9d 100644
--- a/packages/better-auth/src/adapters/drizzle-adapter/drizzle-adapter.ts
+++ b/packages/better-auth/src/adapters/drizzle-adapter/drizzle-adapter.ts
@@ -34,7 +34,7 @@ const createTransform = (
 		const schemaModel = schema[model];
 		if (!schemaModel) {
 			throw new BetterAuthError(
-				`[# Drizzle Adapter]: The model "${modelName}" was not found in the schema object. Please pass the schema directly to the adapter options.`,
+				`[# Drizzle Adapter]: The model "${model}" was not found in the schema object. Please pass the schema directly to the adapter options.`,
 			);
 		}
 		return schemaModel;
diff --git a/packages/better-auth/src/plugins/phone-number/index.ts b/packages/better-auth/src/plugins/phone-number/index.ts
index 3773802112..41e7250bab 100644
--- a/packages/better-auth/src/plugins/phone-number/index.ts
+++ b/packages/better-auth/src/plugins/phone-number/index.ts
@@ -319,7 +319,7 @@ export const phoneNumber = (options?: {
 					}
 
 					let user = await ctx.context.adapter.findOne<UserWithPhoneNumber>({
-						model: ctx.context.tables.user.modelName,
+						model: "user",
 						where: [
 							{
 								value: ctx.body.phoneNumber,
diff --git a/packages/better-auth/src/plugins/username/index.ts b/packages/better-auth/src/plugins/username/index.ts
index 0b2ca9313d..3a80ac1fa8 100644
--- a/packages/better-auth/src/plugins/username/index.ts
+++ b/packages/better-auth/src/plugins/username/index.ts
@@ -21,7 +21,7 @@ export const username = () => {
 				},
 				async (ctx) => {
 					const user = await ctx.context.adapter.findOne<User>({
-						model: ctx.context.tables.user.modelName,
+						model: "user",
 						where: [
 							{
 								field: "username",
@@ -40,15 +40,11 @@ export const username = () => {
 						model: "account",
 						where: [
 							{
-								field:
-									ctx.context.tables.account.fields.userId.fieldName ||
-									"userId",
+								field: "userId",
 								value: user.id,
 							},
 							{
-								field:
-									ctx.context.tables.account.fields.providerId.fieldName ||
-									"providerId",
+								field: "providerId",
 								value: "credential",
 							},
 						],