diff --git a/web/gds-user-ui/src/components/CertificateReview/index.tsx b/web/gds-user-ui/src/components/CertificateReview/index.tsx
index 9eeb5113e..5bcd58d82 100644
--- a/web/gds-user-ui/src/components/CertificateReview/index.tsx
+++ b/web/gds-user-ui/src/components/CertificateReview/index.tsx
@@ -18,6 +18,7 @@ import { getRefreshToken } from 'utils/auth0.helper';
 import { STEPPER_NETWORK } from 'utils/constants';
 import { getUserCurrentOrganizationService } from 'modules/auth/login/auth.service';
 import { setUserOrganization } from 'modules/auth/login/user.slice';
+import { upperCaseFirstLetter } from 'utils/utils';
 const ReviewsSummary = lazy(() => import('./ReviewsSummary'));
 const CertificateReview = () => {
   const toast = useToast();
@@ -64,11 +65,11 @@ const CertificateReview = () => {
       setIsMainNetSubmitting(false);
       setIsTestNetSubmitting(false);
 
-      if (!err?.response?.data?.success) {
+      if (!err?.data?.success) {
         toast({
           position: 'top-right',
           title: t`Error Submitting Certificate`,
-          description: t`${err?.response?.data?.error}`,
+          description: t`${upperCaseFirstLetter(err?.data?.error)}`,
           status: 'error',
           duration: 5000,
           isClosable: true
diff --git a/web/gds-user-ui/src/components/Contacts/ContactsForm.tsx b/web/gds-user-ui/src/components/Contacts/ContactsForm.tsx
index 79f34933c..18231242d 100644
--- a/web/gds-user-ui/src/components/Contacts/ContactsForm.tsx
+++ b/web/gds-user-ui/src/components/Contacts/ContactsForm.tsx
@@ -15,6 +15,7 @@ import FormLayout from 'layouts/FormLayout';
 import { StepsIndexes } from 'constants/steps';
 import { isProdEnv } from 'application/config';
 import { DevTool } from '@hookform/devtools';
+import { useFetchCertificateStep } from 'hooks/useFetchCertificateStep';
 interface ContactsFormProps {
   data?: any;
   isLoading?: boolean;
@@ -25,13 +26,16 @@ const ContactsForm: React.FC<ContactsFormProps> = ({ data, shouldResetForm, onRe
   const { isOpen, onClose, onOpen } = useDisclosure();
   const [shouldShowResetFormModal, setShouldShowResetFormModal] = useState(false);
   const { previousStep, nextStep, currentState, updateIsDirty } = useCertificateStepper();
+  const { certificateStep } = useFetchCertificateStep({
+    key: StepEnum.CONTACTS
+  });
 
   const {
     updateCertificateStep,
     updatedCertificateStep,
     wasCertificateStepUpdated,
     isUpdatingCertificateStep,
-    reset: resetMutation
+    reset
   } = useUpdateCertificateStep();
   const previousStepRef = useRef<any>(false);
   const nextStepRef = useRef<any>(false);
@@ -53,7 +57,7 @@ const ContactsForm: React.FC<ContactsFormProps> = ({ data, shouldResetForm, onRe
   }, [isDirty, updateIsDirty]);
 
   if (wasCertificateStepUpdated && nextStepRef.current) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
@@ -63,18 +67,19 @@ const ContactsForm: React.FC<ContactsFormProps> = ({ data, shouldResetForm, onRe
   }
 
   if (wasCertificateStepUpdated && previousStepRef.current && !isUpdatingCertificateStep) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
     });
-    // console.log('[] prev updatedCertificateStep', updatedCertificateStep);
     previousStepRef.current = false;
     previousStep(updatedCertificateStep);
   }
 
   const handlePreviousStepClick = () => {
-    if (isDirty) {
+    if (!isDirty) {
+      previousStep(certificateStep);
+    } else {
       const payload = {
         step: StepEnum.CONTACTS,
         form: {
@@ -85,7 +90,6 @@ const ContactsForm: React.FC<ContactsFormProps> = ({ data, shouldResetForm, onRe
       updateCertificateStep(payload);
       previousStepRef.current = true;
     }
-    previousStep(data);
   };
 
   useEffect(() => {
@@ -102,13 +106,7 @@ const ContactsForm: React.FC<ContactsFormProps> = ({ data, shouldResetForm, onRe
 
   const handleNextStepClick = () => {
     if (!isDirty) {
-      nextStep({
-        step: StepEnum.CONTACTS,
-        form: {
-          ...methods.getValues(),
-          state: currentState()
-        } as any
-      });
+      nextStep(certificateStep);
     } else {
       const payload = {
         step: StepEnum.CONTACTS,
diff --git a/web/gds-user-ui/src/components/ErrorComponent/RequiredElementMissing.tsx b/web/gds-user-ui/src/components/ErrorComponent/RequiredElementMissing.tsx
index 65c97f5d0..b5cc533f4 100644
--- a/web/gds-user-ui/src/components/ErrorComponent/RequiredElementMissing.tsx
+++ b/web/gds-user-ui/src/components/ErrorComponent/RequiredElementMissing.tsx
@@ -14,9 +14,7 @@ interface RequiredElementMissingProps {
   errorFields?: any[];
 }
 
-const RequiredElementMissing = ({ elementKey, errorFields }: RequiredElementMissingProps) => {
-  console.log('k', elementKey);
-
+const RequiredElementMissing = ({ errorFields }: RequiredElementMissingProps) => {
   return (
     <Alert
       status="error"
@@ -36,7 +34,6 @@ const RequiredElementMissing = ({ elementKey, errorFields }: RequiredElementMiss
         <AlertDescription>
           <UnorderedList>
             {errorFields?.map((errorField: any, index) => {
-              console.log('errorField', errorField);
               return (
                 <ListItem key={index}>
                   <Text as="span" fontWeight="bold">
diff --git a/web/gds-user-ui/src/components/LegalPerson/LegalForm.tsx b/web/gds-user-ui/src/components/LegalPerson/LegalForm.tsx
index 2ac94d6b4..9a9c1eeef 100644
--- a/web/gds-user-ui/src/components/LegalPerson/LegalForm.tsx
+++ b/web/gds-user-ui/src/components/LegalPerson/LegalForm.tsx
@@ -8,7 +8,7 @@ import Address from 'components/Addresses';
 import { FormProvider, useForm } from 'react-hook-form';
 import StepButtons from 'components/StepsButtons';
 import useCertificateStepper from 'hooks/useCertificateStepper';
-import { legalPersonValidationSchemam } from 'modules/dashboard/certificate/lib/legalPersonValidationSchema';
+import { legalPersonValidationSchema } from 'modules/dashboard/certificate/lib/legalPersonValidationSchema';
 import { yupResolver } from '@hookform/resolvers/yup';
 
 import { StepEnum } from 'types/enums';
@@ -17,6 +17,7 @@ import { useUpdateCertificateStep } from 'hooks/useUpdateCertificateStep';
 import { StepsIndexes } from 'constants/steps';
 import { isProdEnv } from 'application/config';
 import { DevTool } from '@hookform/devtools';
+import { useFetchCertificateStep } from 'hooks/useFetchCertificateStep';
 interface LegalFormProps {
   data?: any;
   isLoading?: boolean;
@@ -29,16 +30,19 @@ const LegalForm: React.FC<LegalFormProps> = ({ data, shouldResetForm, onResetFor
   const { isOpen, onClose, onOpen } = useDisclosure();
   const [shouldShowResetFormModal, setShouldShowResetFormModal] = useState(false);
   const { previousStep, nextStep, currentState, updateIsDirty } = useCertificateStepper();
+  const { certificateStep } = useFetchCertificateStep({
+    key: StepEnum.LEGAL
+  });
   const {
     updateCertificateStep,
     updatedCertificateStep,
-    reset: resetMutation,
+    reset,
     wasCertificateStepUpdated,
     isUpdatingCertificateStep
   } = useUpdateCertificateStep();
   const previousStepRef = useRef<any>(false);
   const nextStepRef = useRef<any>(false);
-  const resolver = yupResolver(legalPersonValidationSchemam);
+  const resolver = yupResolver(legalPersonValidationSchema);
   const methods = useForm({
     defaultValues: data,
     resolver,
@@ -56,7 +60,7 @@ const LegalForm: React.FC<LegalFormProps> = ({ data, shouldResetForm, onResetFor
   };
 
   if (wasCertificateStepUpdated && nextStepRef.current) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
@@ -66,25 +70,18 @@ const LegalForm: React.FC<LegalFormProps> = ({ data, shouldResetForm, onResetFor
   }
 
   if (wasCertificateStepUpdated && previousStepRef.current && !isUpdatingCertificateStep) {
-    resetMutation();
+    reset();
     // reset the form with the new values
-    resetForm(updatedCertificateStep?.form, {
+   resetForm(updatedCertificateStep?.form, {
       keepValues: false
     });
-    // console.log('[] prev updatedCertificateStep', updatedCertificateStep);
     previousStepRef.current = false;
     previousStep(updatedCertificateStep);
   }
 
   const handleNextStepClick = () => {
     if (!isDirty) {
-      nextStep({
-        step: StepEnum.LEGAL,
-        form: {
-          ...methods.getValues(),
-          state: currentState()
-        } as any
-      });
+      nextStep(certificateStep);
     } else {
       const payload = {
         step: StepEnum.LEGAL,
@@ -96,12 +93,13 @@ const LegalForm: React.FC<LegalFormProps> = ({ data, shouldResetForm, onResetFor
 
       updateCertificateStep(payload);
       nextStepRef.current = true;
-      // nextStep(updatedCertificateStep);
     }
   };
 
   const handlePreviousStepClick = () => {
-    if (isDirty) {
+    if (!isDirty) {
+      previousStep(certificateStep);
+    } else {
       const payload = {
         step: StepEnum.LEGAL,
         form: {
@@ -109,14 +107,9 @@ const LegalForm: React.FC<LegalFormProps> = ({ data, shouldResetForm, onResetFor
           state: currentState()
         } as any
       };
-      // console.log('[] isDirty  payload', payload);
-
       updateCertificateStep(payload);
       previousStepRef.current = true;
-      // previousStep(updatedCertificateStep);
     }
-
-    previousStep(data);
   };
 
   const handleResetForm = () => {
diff --git a/web/gds-user-ui/src/components/LegalPerson/index.tsx b/web/gds-user-ui/src/components/LegalPerson/index.tsx
index a93f7a308..9a90429eb 100644
--- a/web/gds-user-ui/src/components/LegalPerson/index.tsx
+++ b/web/gds-user-ui/src/components/LegalPerson/index.tsx
@@ -21,7 +21,6 @@ const LegalPerson: React.FC = () => {
     useFetchCertificateStep({
       key: StepEnum.LEGAL
     });
-
   const { isStepDeleted, updateDeleteStepState } = useCertificateStepper();
   const isLegalStepDeleted = isStepDeleted(StepEnum.LEGAL);
 
diff --git a/web/gds-user-ui/src/components/OtherJuridictions/OtherJuridictions.stories.tsx b/web/gds-user-ui/src/components/OtherJurisdictions/OtherJurisdictions.stories.tsx
similarity index 53%
rename from web/gds-user-ui/src/components/OtherJuridictions/OtherJuridictions.stories.tsx
rename to web/gds-user-ui/src/components/OtherJurisdictions/OtherJurisdictions.stories.tsx
index 1d2348037..39f4a115c 100644
--- a/web/gds-user-ui/src/components/OtherJuridictions/OtherJuridictions.stories.tsx
+++ b/web/gds-user-ui/src/components/OtherJurisdictions/OtherJurisdictions.stories.tsx
@@ -1,18 +1,18 @@
 import { Meta, Story } from '@storybook/react';
 import { withRHF } from 'hoc/withRHF';
-import OtherJuridictions from '.';
+import OtherJurisdictions from '.';
 
-type OtherJuridictionsProps = {
+type OtherJurisdictionsProps = {
   name: string;
 };
 
 export default {
-  title: 'components/OtherJuridictions',
-  component: OtherJuridictions,
+  title: 'components/OtherJurisdictions',
+  component: OtherJurisdictions,
   decorators: [withRHF(false)]
 } as Meta;
 
-const Template: Story<OtherJuridictionsProps> = (args) => <OtherJuridictions {...args} />;
+const Template: Story<OtherJurisdictionsProps> = (args) => <OtherJurisdictions {...args} />;
 
 export const Standard = Template.bind({});
 Standard.args = {
diff --git a/web/gds-user-ui/src/components/OtherJuridictions/index.tsx b/web/gds-user-ui/src/components/OtherJurisdictions/index.tsx
similarity index 92%
rename from web/gds-user-ui/src/components/OtherJuridictions/index.tsx
rename to web/gds-user-ui/src/components/OtherJurisdictions/index.tsx
index 57297b7a5..562da58e7 100644
--- a/web/gds-user-ui/src/components/OtherJuridictions/index.tsx
+++ b/web/gds-user-ui/src/components/OtherJurisdictions/index.tsx
@@ -6,14 +6,14 @@ import { getCountriesOptions } from 'constants/countries';
 import { Controller, useFieldArray, useFormContext } from 'react-hook-form';
 import { t } from '@lingui/macro';
 import { Trans } from '@lingui/react';
-const OtherJuridictions: React.FC<{ name: string }> = ({ name }) => {
+const OtherJurisdictions: React.FC<{ name: string }> = ({ name }) => {
   const { control, register } = useFormContext();
   const { fields, append, remove } = useFieldArray({
     name,
     control
   });
 
-  const handleAddJuridictionClick = () => {
+  const handleAddJurisdictionClick = () => {
     append({
       country: '',
       regulator_name: ''
@@ -61,7 +61,7 @@ const OtherJuridictions: React.FC<{ name: string }> = ({ name }) => {
       ))}
 
       <Button
-        onClick={handleAddJuridictionClick}
+        onClick={handleAddJurisdictionClick}
         borderRadius={5}
         data-testid="trixo-add-jurisdictions-btn">
         <Trans id="Add Jurisdiction">Add Jurisdiction</Trans>
@@ -70,4 +70,4 @@ const OtherJuridictions: React.FC<{ name: string }> = ({ name }) => {
   );
 };
 
-export default OtherJuridictions;
+export default OtherJurisdictions;
diff --git a/web/gds-user-ui/src/components/TrisaImplementation/TrisaImplementationForm.tsx b/web/gds-user-ui/src/components/TrisaImplementation/TrisaImplementationForm.tsx
index b41947aa0..67647ba65 100644
--- a/web/gds-user-ui/src/components/TrisaImplementation/TrisaImplementationForm.tsx
+++ b/web/gds-user-ui/src/components/TrisaImplementation/TrisaImplementationForm.tsx
@@ -13,6 +13,7 @@ import TrisaImplementationForm from './TrisaImplementationForm/index';
 import { StepsIndexes } from 'constants/steps';
 import { isProdEnv } from 'application/config';
 import { DevTool } from '@hookform/devtools';
+import { useFetchCertificateStep } from 'hooks/useFetchCertificateStep';
 interface TrisaFormProps {
   data?: any;
   isLoading?: boolean;
@@ -23,12 +24,15 @@ const TrisaForm: React.FC<TrisaFormProps> = ({ data, shouldResetForm, onResetFor
   const { isOpen, onClose, onOpen } = useDisclosure();
   const [shouldShowResetFormModal, setShouldShowResetFormModal] = useState(false);
   const { previousStep, nextStep, currentState, updateIsDirty } = useCertificateStepper();
+  const { certificateStep } = useFetchCertificateStep({
+    key: StepEnum.TRISA
+  });
   const {
     updateCertificateStep,
     updatedCertificateStep,
     wasCertificateStepUpdated,
     isUpdatingCertificateStep,
-    reset: resetMutation
+    reset
   } = useUpdateCertificateStep();
   const previousStepRef = useRef<any>(false);
   const nextStepRef = useRef<any>(false);
@@ -56,7 +60,7 @@ const TrisaForm: React.FC<TrisaFormProps> = ({ data, shouldResetForm, onResetFor
   }, [shouldShowResetFormModal]);
 
   if (wasCertificateStepUpdated && nextStepRef.current) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
@@ -66,7 +70,7 @@ const TrisaForm: React.FC<TrisaFormProps> = ({ data, shouldResetForm, onResetFor
   }
 
   if (wasCertificateStepUpdated && previousStepRef.current && !isUpdatingCertificateStep) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form);
     previousStepRef.current = false;
@@ -74,7 +78,9 @@ const TrisaForm: React.FC<TrisaFormProps> = ({ data, shouldResetForm, onResetFor
   }
 
   const handlePreviousStepClick = () => {
-    if (isDirty) {
+    if (!isDirty) {
+      previousStep(certificateStep);
+    } else {
       const payload = {
         step: StepEnum.TRISA,
         form: {
@@ -85,18 +91,11 @@ const TrisaForm: React.FC<TrisaFormProps> = ({ data, shouldResetForm, onResetFor
       updateCertificateStep(payload);
       previousStepRef.current = true;
     }
-    previousStep(data);
   };
 
   const handleNextStepClick = () => {
     if (!isDirty) {
-      nextStep({
-        step: StepEnum.TRISA,
-        form: {
-          ...methods.getValues(),
-          state: currentState()
-        } as any
-      });
+      nextStep(certificateStep);
     } else {
       const payload = {
         step: StepEnum.TRISA,
diff --git a/web/gds-user-ui/src/components/TrixoQuestionnaireForm/index.tsx b/web/gds-user-ui/src/components/TrixoQuestionnaireForm/index.tsx
index 4968bf416..08e8c535b 100644
--- a/web/gds-user-ui/src/components/TrixoQuestionnaireForm/index.tsx
+++ b/web/gds-user-ui/src/components/TrixoQuestionnaireForm/index.tsx
@@ -1,12 +1,11 @@
 import { useEffect, useState, useRef, Dispatch, SetStateAction } from 'react';
 import { Box, Grid, GridItem, Heading, Text, VStack, chakra, useDisclosure } from '@chakra-ui/react';
-import OtherJuridictions from 'components/OtherJuridictions';
 import Regulations from 'components/Regulations';
 import SwitchFormControl from 'components/SwitchFormControl';
 import InputFormControl from 'components/ui/InputFormControl';
 import SelectFormControl from 'components/ui/SelectFormControl';
 import { getCountriesOptions } from 'constants/countries';
-import { getCurrenciesOptions, getFinancialTransfertsPermittedOptions } from 'constants/trixo';
+import { getCurrenciesOptions, getFinancialTransfersPermittedOptions } from 'constants/trixo';
 import FormLayout from 'layouts/FormLayout';
 import { Controller, useForm, FormProvider } from 'react-hook-form';
 
@@ -22,6 +21,8 @@ import useCertificateStepper from 'hooks/useCertificateStepper';
 import { StepsIndexes } from 'constants/steps';
 import { isProdEnv } from 'application/config';
 import { DevTool } from '@hookform/devtools';
+import { useFetchCertificateStep } from 'hooks/useFetchCertificateStep';
+import OtherJurisdictions from 'components/OtherJurisdictions';
 
 interface TrixoFormProps {
   data: any;
@@ -37,6 +38,9 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
   const { isOpen, onClose, onOpen } = useDisclosure();
   const [shouldShowResetFormModal, setShouldShowResetFormModal] = useState<boolean>(false);
   const { previousStep, nextStep, currentState, updateIsDirty } = useCertificateStepper();
+  const { certificateStep } = useFetchCertificateStep({
+    key: StepEnum.TRIXO
+  });
 
   const resolver = yupResolver(trixoQuestionnaireValidationSchema);
   const methods = useForm({
@@ -57,7 +61,7 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
   const previousStepRef = useRef<any>(false);
   const nextStepRef = useRef<any>(false);
   const countries = getCountriesOptions();
-  const financialTransfertsOptions = getFinancialTransfertsPermittedOptions();
+  const financialTransfersOptions = getFinancialTransfersPermittedOptions();
   const currencies = getCurrenciesOptions();
   const getHasRequiredRegulatoryProgram = watch('trixo.has_required_regulatory_program');
   const getMustComplyRegulations = watch('trixo.must_comply_travel_rule');
@@ -73,7 +77,7 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
     updatedCertificateStep,
     isUpdatingCertificateStep,
     wasCertificateStepUpdated,
-    reset: resetMutation
+    reset
   } = useUpdateCertificateStep();
   const onCloseModalHandler = () => {
     setShouldShowResetFormModal(false);
@@ -81,7 +85,7 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
   };
 
   if (wasCertificateStepUpdated && nextStepRef.current) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
@@ -91,7 +95,7 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
   }
 
   if (wasCertificateStepUpdated && previousStepRef.current && !isUpdatingCertificateStep) {
-    resetMutation();
+    reset();
     // reset the form with the new values
     resetForm(updatedCertificateStep?.form, {
       keepValues: false
@@ -117,23 +121,14 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
       updateCertificateStep(payload);
       nextStepRef.current = true;
     } else {
-      nextStep({
-        step: StepEnum.TRIXO,
-        form: {
-          ...methods.getValues(),
-          state: currentState()
-        } as any
-      });
+      nextStep(certificateStep);
     }
   };
 
   const handlePreviousStepClick = () => {
-    // isDirty is not working for the checkbox so we need to compare the values
-    if (
-      isDirty ||
-      getMustComplyRegulationsFromData !== getMustComplyRegulations ||
-      getHasRequiredRegulatoryProgramFromData !== getHasRequiredRegulatoryProgram
-    ) {
+    if (!isDirty) {
+      previousStep(certificateStep);
+    } else {
       const payload = {
         step: StepEnum.TRIXO,
         form: {
@@ -141,11 +136,9 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
           state: currentState()
         } as any
       };
-
       updateCertificateStep(payload);
       previousStepRef.current = true;
     }
-    previousStep(data);
   };
 
   const handleResetForm = () => {
@@ -255,7 +248,7 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
               </Trans>
             </Text>
 
-            <OtherJuridictions name={'trixo.other_jurisdictions'} />
+            <OtherJurisdictions name={'trixo.other_jurisdictions'} />
           </VStack>
 
           <VStack data-testid="is-required-financial-transfers">
@@ -267,8 +260,8 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
                   ref={field.ref}
                   name={field.name}
                   data-testid="financial_transfers_permitted"
-                  options={financialTransfertsOptions}
-                  value={financialTransfertsOptions.find((option) => option.value === field.value)}
+                  options={financialTransfersOptions}
+                  value={financialTransfersOptions.find((option) => option.value === field.value)}
                   onChange={(newValue: any) => field.onChange(newValue.value)}
                   label={t`Is your organization permitted to send and/or receive transfers of virtual assets in the jurisdictions in which it operates?`}
                   controlId="financial_transfers_permitted"
@@ -288,10 +281,10 @@ const TrixoQuestionnaireForm: React.FC<TrixoFormProps> = ({
                 <SelectFormControl
                   ref={field.ref}
                   name={field.name}
-                  options={financialTransfertsOptions.filter(
+                  options={financialTransfersOptions.filter(
                     (option) => option.value !== 'partially'
                   )}
-                  value={financialTransfertsOptions.find((option) => option.value === field.value)}
+                  value={financialTransfersOptions.find((option) => option.value === field.value)}
                   onChange={(newValue: any) => field.onChange(newValue.value)}
                   label={t`Does your organization have a programme that sets minimum Anti-Money
               Laundering (AML), Countering the Financing of Terrorism (CFT), Know your
diff --git a/web/gds-user-ui/src/constants/trixo.ts b/web/gds-user-ui/src/constants/trixo.ts
index 473b343ac..0efe10e81 100644
--- a/web/gds-user-ui/src/constants/trixo.ts
+++ b/web/gds-user-ui/src/constants/trixo.ts
@@ -1,14 +1,14 @@
 import { t } from '@lingui/macro';
 import currencies from 'utils/currencies.json';
 
-const FINANCIAL_TRANSFERTS_PERMITTED_OPTIONS = {
+const FINANCIAL_TRANSFERS_PERMITTED_OPTIONS = {
   yes: t`Yes`,
   partially: t`Partially`,
   no: t`No`
 };
 
-export const getFinancialTransfertsPermittedOptions = () =>
-  Object.entries(FINANCIAL_TRANSFERTS_PERMITTED_OPTIONS).map(([k, v]) => ({ value: k, label: v }));
+export const getFinancialTransfersPermittedOptions = () =>
+  Object.entries(FINANCIAL_TRANSFERS_PERMITTED_OPTIONS).map(([k, v]) => ({ value: k, label: v }));
 
 export const getCurrenciesOptions = () => {
   return Object.entries(currencies).map(([k]) => ({ value: k, label: k }));
diff --git a/web/gds-user-ui/src/modules/dashboard/certificate/lib/legalPersonValidationSchema.ts b/web/gds-user-ui/src/modules/dashboard/certificate/lib/legalPersonValidationSchema.ts
index 726ed4a19..dcc8f3bff 100644
--- a/web/gds-user-ui/src/modules/dashboard/certificate/lib/legalPersonValidationSchema.ts
+++ b/web/gds-user-ui/src/modules/dashboard/certificate/lib/legalPersonValidationSchema.ts
@@ -5,7 +5,7 @@ import * as yup from 'yup';
 
 const _i18n = setupI18n();
 
-export const legalPersonValidationSchemam = yup.object().shape({
+export const legalPersonValidationSchema = yup.object().shape({
   entity: yup.object().shape({
     country_of_registration: yup.string(),
     // .required(_i18n._(t`Country of registration is required.`)),
diff --git a/web/gds-user-ui/src/modules/dashboard/certificate/lib/utils.ts b/web/gds-user-ui/src/modules/dashboard/certificate/lib/utils.ts
index 70a9645d2..6065a6aff 100644
--- a/web/gds-user-ui/src/modules/dashboard/certificate/lib/utils.ts
+++ b/web/gds-user-ui/src/modules/dashboard/certificate/lib/utils.ts
@@ -1,5 +1,5 @@
 import { basicDetailsValidationSchema } from 'modules/dashboard/certificate/lib/basicDetailsValidationSchema';
-import { legalPersonValidationSchemam } from 'modules/dashboard/certificate/lib/legalPersonValidationSchema';
+import { legalPersonValidationSchema } from 'modules/dashboard/certificate/lib/legalPersonValidationSchema';
 import { contactsValidationSchema } from 'modules/dashboard/certificate/lib/contactsValidationSchema';
 import { trisaImplementationValidationSchema } from 'modules/dashboard/certificate/lib/trisaImplementationValidationSchema';
 import { trixoQuestionnaireValidationSchema } from 'modules/dashboard/certificate/lib/trixoQuestionnaireValidationSchema';
@@ -16,7 +16,7 @@ export const isBasicDetailsCompleted = async (data: any) => {
 
 export const isLegalPersonCompleted = async (data: any) => {
   try {
-    const r = await legalPersonValidationSchemam.validate(data);
+    const r = await legalPersonValidationSchema.validate(data);
     console.log(r);
     return true;
   } catch (err) {
diff --git a/web/gds-user-ui/src/modules/dashboard/certificate/lib/validationSchema.ts b/web/gds-user-ui/src/modules/dashboard/certificate/lib/validationSchema.ts
index 3ea3d58af..33427786a 100644
--- a/web/gds-user-ui/src/modules/dashboard/certificate/lib/validationSchema.ts
+++ b/web/gds-user-ui/src/modules/dashboard/certificate/lib/validationSchema.ts
@@ -1,5 +1,5 @@
 import { reviewValidationSchema } from './reviewValidationSchema';
-import { legalPersonValidationSchemam } from './legalPersonValidationSchema';
+import { legalPersonValidationSchema } from './legalPersonValidationSchema';
 import { basicDetailsValidationSchema } from './basicDetailsValidationSchema';
 import { contactsValidationSchema } from './contactsValidationSchema';
 import { trisaImplementationValidationSchema } from './trisaImplementationValidationSchema';
@@ -7,7 +7,7 @@ import { trixoQuestionnaireValidationSchema } from './trixoQuestionnaireValidati
 
 export const validationSchema = [
   basicDetailsValidationSchema,
-  legalPersonValidationSchemam,
+  legalPersonValidationSchema,
   contactsValidationSchema,
   trisaImplementationValidationSchema,
   trixoQuestionnaireValidationSchema,
diff --git a/web/gds-user-ui/src/utils/utils.ts b/web/gds-user-ui/src/utils/utils.ts
index 286dd91f5..eef7e340e 100644
--- a/web/gds-user-ui/src/utils/utils.ts
+++ b/web/gds-user-ui/src/utils/utils.ts
@@ -7,9 +7,10 @@ import * as Sentry from '@sentry/react';
 import { getRegistrationDefaultValue } from 'modules/dashboard/registration/utils';
 import { getCookie, setCookie } from 'utils/cookies';
 const DEFAULT_REGISTRATION_AUTHORITY = 'RA777777';
-export const findStepKey = (steps: any, key: number) =>
-  steps?.filter((step: any) => step.key === key);
-
+export const findStepKey = (steps: any, key: number) => {
+  return steps?.filter((step: any) => step.key === key);
+};
+ 
 export const isValidUuid = (str: string) => {
   // Regular expression to check if string is a valid UUID
   const regexExp =