1 files changed, 10 insertions, 2 deletions
diff --git a/packages/kyc-ui/src/pages/FillForm.tsx b/packages/kyc-ui/src/pages/FillForm.tsx
index 0b691dc11..52b893e40 100644
--- a/packages/kyc-ui/src/pages/FillForm.tsx
+++ b/packages/kyc-ui/src/pages/FillForm.tsx
@@ -43,6 +43,7 @@ import {
   validateRequiredFields,
 } from "../hooks/form.js";
 import { undefinedIfEmpty } from "./Start.js";
+import { useUiFormsContext } from "../context/ui-forms.js";
 
 type Props = {
   token: AccessToken;
@@ -80,14 +81,21 @@ export function FillForm({
   const customForm =
     requirement.context && "form" in requirement.context
       ? ({
-          id: "by-context",
+          id: (requirement.context.form as any).id,
           config: requirement.context.form,
           label: "Officer defined form",
           version: 1,
         } as FormMetadata)
       : undefined;
 
-  const theForm = searchForm(i18n, customForm ? [customForm] : [], formId, requirement.context);
+  const { forms } = useUiFormsContext();
+  const allForms = customForm ? [...forms, customForm] : forms
+  const theForm = searchForm(
+    i18n,
+    allForms,
+    formId,
+    requirement.context,
+  );
   if (!theForm) {
     return <div>form with id {formId} not found</div>;
   }