diff --git a/src-ts/lib/form/Form.tsx b/src-ts/lib/form/Form.tsx
index 7def56566..fa7445cb1 100644
--- a/src-ts/lib/form/Form.tsx
+++ b/src-ts/lib/form/Form.tsx
@@ -62,8 +62,16 @@ const Form: <ValueType extends any, RequestType extends any>(props: FormProps<Va
                 return
             }
 
-            // validators do not clear errors on the 'initial' event,
-            // so we call validateForm as a change here, to support the parent component sending props.formValues updates due to async data loading
+            validateForm(formRef.current?.elements, 'initial', inputs)
+            checkIfFormIsValid(inputs)
+        }, [])
+
+        useEffect(() => {
+            if (!formRef.current?.elements) {
+                return
+            }
+
+            // so we repeat the validation when formValues changes, to support the parent component's async data loading
             validateForm(formRef.current?.elements, 'change', inputs)
             checkIfFormIsValid(inputs)
         }, [props.formValues])
diff --git a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
index 8910c8c3b..066a695b0 100644
--- a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
+++ b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
@@ -5,8 +5,10 @@ import {
     Form,
     FormAction,
     FormDefinition,
+    formGetInputFields,
     formGetInputModel,
     FormInputModel,
+    formOnReset,
     IconOutline,
     InfoCard,
     LoadingSpinner,
@@ -66,6 +68,11 @@ const BugHuntIntakeForm: React.FC = () => {
     const [selectedPackage, setSelectedPackage]: [PricePackageName, Dispatch<SetStateAction<PricePackageName>>]
         = useState<PricePackageName>(formValues.packageType)
 
+    const formInputs: Array<FormInputModel> = formGetInputFields(formDef.groups)
+    if (!workId && !challenge) {
+        formOnReset(formInputs, formValues)
+    }
+
     useEffect(() => {
         const useEffectAsync: () => Promise<void> = async () => {
             if (!workId) {