diff --git a/src/types/forms/checkIn.ts b/src/types/forms/checkIn.ts
index 99282cf2..2100f6d0 100644
--- a/src/types/forms/checkIn.ts
+++ b/src/types/forms/checkIn.ts
@@ -4,11 +4,11 @@ import { zOrganizationResponse } from '../dataModel/organization';
 import { zObjectId } from '../dataModel/base';
 
 export const zCheckInFormData = z.object({
-  firstName: z.string().nonempty('Required'),
-  lastName: z.string().nonempty('Required'),
-  email: z.string().email().nonempty('Required'),
-  phoneNumber: z.string().nonempty('Required'),
-  address: z.string().nonempty('Required'),
+  firstName: z.string().min(1, 'Required'),
+  lastName: z.string().min(1, 'Required'),
+  email: z.string().email().min(1, 'Required'),
+  phoneNumber: z.string().min(1, 'Required'),
+  address: z.string().min(1, 'Required'),
   role: zRole,
   organization: zOrganizationResponse.optional(),
   volunteerId: zObjectId.optional(),
diff --git a/src/types/forms/email.ts b/src/types/forms/email.ts
index 010f7f6f..e7e1fff4 100644
--- a/src/types/forms/email.ts
+++ b/src/types/forms/email.ts
@@ -1,8 +1,8 @@
 import { z } from 'zod';
 
 export const EmailFormData = z.object({
-  subject: z.string().nonempty('Required'),
-  emailbody: z.string().nonempty('Required'),
+  subject: z.string().min(1, 'Required'),
+  emailbody: z.string().min(1, 'Required'),
 });
 
 export interface EmailFormData extends z.infer<typeof EmailFormData> {}
diff --git a/src/types/forms/events.ts b/src/types/forms/events.ts
index 0edd5425..be11e085 100644
--- a/src/types/forms/events.ts
+++ b/src/types/forms/events.ts
@@ -11,7 +11,7 @@ const zDayJs = z.custom<Dayjs>((val) => val instanceof dayjs, 'Invalid date');
 
 export const zEventFormData = z
   .object({
-    name: z.string().nonempty('Required'),
+    name: z.string().min(1, 'Required'),
     description: z.string().optional(),
     eventLocation: z.string().optional(),
     date: zDayJs,
diff --git a/src/types/forms/organizations.ts b/src/types/forms/organizations.ts
index 6a18ab90..e5ed2cbe 100644
--- a/src/types/forms/organizations.ts
+++ b/src/types/forms/organizations.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 export const zUpsertOrganizationFormData = z.object({
-  name: z.string().nonempty('Required'),
+  name: z.string().min(1, 'Required'),
 });
 
 export interface UpsertOrganizationFormData
diff --git a/src/types/forms/role-verifications.ts b/src/types/forms/role-verifications.ts
index 453b6adb..ebfa2509 100644
--- a/src/types/forms/role-verifications.ts
+++ b/src/types/forms/role-verifications.ts
@@ -3,7 +3,7 @@ import { zVerifiedRole } from '../dataModel/roles';
 
 export const zUpsertRoleVerificationFormData = z.object({
   role: zVerifiedRole,
-  verifier: z.string().nonempty('Required'),
+  verifier: z.string().min(1, 'Required'),
 });
 
 export interface UpsertRoleVerificationFormData
diff --git a/src/types/forms/volunteer.ts b/src/types/forms/volunteer.ts
index 4228f4e4..682e00b0 100644
--- a/src/types/forms/volunteer.ts
+++ b/src/types/forms/volunteer.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod';
 // Data Form for create/update Volunteer
 export const zUpsertVolunteerFormData = z.object({
-  firstName: z.string().nonempty('Required'),
-  lastName: z.string().nonempty('Required'),
-  email: z.string().email().nonempty('Required'),
-  phoneNumber: z.string().nonempty('Required'),
-  address: z.string().nonempty('Required'),
+  firstName: z.string().min(1, 'Required'),
+  lastName: z.string().min(1, 'Required'),
+  email: z.string().email().min(1, 'Required'),
+  phoneNumber: z.string().min(1, 'Required'),
+  address: z.string().min(1, 'Required'),
 });
 
 export interface UpsertVolunteerFormData