diff --git a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeBackgroundCheck.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeBackgroundCheck.tsx
index 32d52eb2a7..db1160434e 100644
--- a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeBackgroundCheck.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeBackgroundCheck.tsx
@@ -191,8 +191,8 @@ export function EmployeeBackgroundCheck({
       }
 
       form.reset({
-        employeeName: pendingRequest.employeeName,
-        employeeEmail: pendingRequest.employeeEmail,
+        employeeName: form.getValues('employeeName') || employee.user.name || '',
+        employeeEmail: form.getValues('employeeEmail') || '',
         requesterNotes: pendingRequest.requesterNotes ?? '',
       });
       setBillingSetupComplete(true);
diff --git a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/backgroundCheckForm.ts b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/backgroundCheckForm.ts
index bf77573e1e..6d2b543473 100644
--- a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/backgroundCheckForm.ts
+++ b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/backgroundCheckForm.ts
@@ -8,9 +8,10 @@ export const backgroundCheckSchema = z.object({
 
 export type BackgroundCheckFormValues = z.infer<typeof backgroundCheckSchema>;
 
-const pendingBackgroundCheckSchema = backgroundCheckSchema.extend({
+const pendingBackgroundCheckSchema = z.object({
   memberId: z.string(),
   organizationId: z.string(),
+  requesterNotes: z.string().optional(),
 });
 
 export type PendingBackgroundCheckRequest = z.infer<typeof pendingBackgroundCheckSchema>;
@@ -65,8 +66,6 @@ export function writePendingBackgroundCheckRequest({
   const pendingRequest: PendingBackgroundCheckRequest = {
     organizationId,
     memberId,
-    employeeName: values.employeeName,
-    employeeEmail: values.employeeEmail,
     requesterNotes: values.requesterNotes,
   };
   window.sessionStorage.setItem(