diff --git a/frontend/src/components/AssetNumericInput/index.tsx b/frontend/src/components/AssetNumericInput/index.tsx
index 6753dad05..c22af4810 100644
--- a/frontend/src/components/AssetNumericInput/index.tsx
+++ b/frontend/src/components/AssetNumericInput/index.tsx
@@ -1,7 +1,7 @@
 import { ChangeEvent, FC } from 'react';
 import { UseFormRegisterReturn } from 'react-hook-form';
 import { AssetButton } from '../buttons/AssetButton';
-import { RampFormValues } from '../Nabla/schema';
+import { RampFormValues } from '../../hooks/ramp/schema';
 import { NumericInput } from '../NumericInput';
 import { cn } from '../../helpers/cn';
 
diff --git a/frontend/src/components/BrlaComponents/BrlaSwapFields/index.tsx b/frontend/src/components/BrlaComponents/BrlaSwapFields/index.tsx
index 5c79bb16e..8b918a69a 100644
--- a/frontend/src/components/BrlaComponents/BrlaSwapFields/index.tsx
+++ b/frontend/src/components/BrlaComponents/BrlaSwapFields/index.tsx
@@ -16,11 +16,11 @@ const containerAnimation: MotionProps = {
 };
 
 const OFFRAMP_FIELDS = [
-  { id: StandardBrlaFieldOptions.TAX_ID, label: 'CPF', index: 0 },
-  { id: StandardBrlaFieldOptions.PIX_ID, label: 'PIX', index: 1 },
+  { id: StandardBrlaFieldOptions.TAX_ID, label: 'cpfOrCnpj', index: 0 },
+  { id: StandardBrlaFieldOptions.PIX_ID, label: 'pixKey', index: 1 },
 ];
 
-const ONRAMP_FIELDS = [{ id: StandardBrlaFieldOptions.TAX_ID, label: 'CPF', index: 0 }];
+const ONRAMP_FIELDS = [{ id: StandardBrlaFieldOptions.TAX_ID, label: 'cpfOrCnpj', index: 0 }];
 
 /**
  * BrlaSwapFields component
@@ -49,9 +49,11 @@ export const BrlaSwapFields: FC = () => {
               className="mt-2"
               key={field.id}
               id={field.id}
-              label={field.label}
+              label={t(`components.brlaSwapField.${field.label}`)}
               index={field.index}
-              placeholder={t(`components.brlaSwapField.placeholder`, { label: field.label })}
+              placeholder={t(`components.brlaSwapField.placeholder`, {
+                label: t(`components.brlaSwapField.${field.label}`),
+              })}
             />
           ))}
           <div className="mt-2">
diff --git a/frontend/src/components/BrlaComponents/KYCForm/index.tsx b/frontend/src/components/BrlaComponents/KYCForm/index.tsx
index dbe9d567c..b1d7a650d 100644
--- a/frontend/src/components/BrlaComponents/KYCForm/index.tsx
+++ b/frontend/src/components/BrlaComponents/KYCForm/index.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { motion } from 'motion/react';
 import { FormProvider, UseFormReturn } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 
 import { BrlaField, BrlaFieldProps, ExtendedBrlaFieldOptions } from '../BrlaField';
 import { KYCFormData } from '../../../hooks/brla/useKYCForm';
@@ -32,14 +32,7 @@ export const KYCForm = ({ form, onSubmit, onBackClick, fields }: KYCFormProps) =
         className="px-4 pt-4 pb-2 mx-4 mt-8 mb-4 rounded-lg shadow-custom md:mx-auto md:w-96 min-h-[480px]"
         onSubmit={handleSubmit(onSubmit)}
       >
-        <h1 className="mt-2 mb-2 text-3xl font-bold text-center text-blue-700">{t('components.brlaKYCForm.title')}</h1>
-        <div className="text-primary-500 text-center mb-6">
-          {t('components.brlaKYCForm.description')}
-          <a className="underline" target="_blank" rel="noreferrer" href="https://www.brla.digital">
-            BRLA
-          </a>
-          .
-        </div>
+        <h1 className="mt-2 mb-4 text-3xl font-bold text-center text-blue-700">{t('components.brlaKYCForm.title')}</h1>
         <div className="grid grid-cols-2 gap-4">
           {fields.map((field) => (
             <BrlaField
@@ -57,7 +50,20 @@ export const KYCForm = ({ form, onSubmit, onBackClick, fields }: KYCFormProps) =
             />
           ))}
         </div>
-
+        <div className="text-primary-500 text-center mt-4">
+          <Trans
+            i18nKey="components.brlaKYCForm.description"
+            components={{
+              a: <a className="underline" target="_blank" rel="noreferrer" href="https://www.brla.digital" />,
+            }}
+          >
+            Complete these quick identity checks (typically 90 seconds). Data is processed securely by{' '}
+            <a className="underline" target="_blank" rel="noreferrer" href="https://www.brla.digital">
+              BRLA
+            </a>{' '}
+            using bank-grade encryption for transaction security.
+          </Trans>
+        </div>
         <div className="grid gap-3 mt-8 mb-8">
           <div className="flex gap-3">
             <button type="button" className="btn-vortex-primary-inverse btn flex-1" onClick={onBackClick}>
diff --git a/frontend/src/components/Nabla/schema.tsx b/frontend/src/components/Nabla/schema.tsx
deleted file mode 100644
index 6620d9802..000000000
--- a/frontend/src/components/Nabla/schema.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as Yup from 'yup';
-import { useTranslation } from 'react-i18next';
-
-import { OnChainToken, FiatToken } from 'shared';
-
-export type RampFormValues = {
-  inputAmount: string;
-  outputAmount?: string;
-  onChainToken: OnChainToken;
-  fiatToken: FiatToken;
-  slippage: number | undefined;
-  deadline: number;
-  taxId?: string;
-  pixId?: string;
-};
-
-const transformNumber = (value: unknown, originalValue: unknown) => {
-  if (!originalValue) return 0;
-  if (typeof originalValue === 'string' && originalValue !== '') value = Number(originalValue) ?? 0;
-  return value;
-};
-
-const cpfRegex = /^\d{3}(\.\d{3}){2}-\d{2}$|^\d{11}$/;
-
-// Regex adopted from here https://developers.international.pagseguro.com/reference/pix-key-validation-and-regex-1
-const pixKeyRegex = [
-  cpfRegex,
-  /^[0-9]{14}$/, // CNPJ
-  /^\+[1-9][0-9]\d{1,14}$/, // Phone
-  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, // Email
-  /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/, // Random
-];
-
-export const useSchema = () => {
-  const { t } = useTranslation();
-
-  return Yup.object<RampFormValues>().shape({
-    from: Yup.string().required(),
-    fromAmount: Yup.string().required(),
-    to: Yup.string().required(),
-    toAmount: Yup.string().required(),
-    slippage: Yup.number().nullable().transform(transformNumber),
-    deadline: Yup.number().nullable().transform(transformNumber),
-    taxId: Yup.string().when('to', {
-      is: 'brl',
-      then: (schema) =>
-        schema
-          .matches(cpfRegex, t('components.swap.validation.taxId.format'))
-          .required(t('components.swap.validation.taxId.required')),
-      otherwise: (schema) => schema.optional(),
-    }),
-    pixId: Yup.string().when('to', {
-      is: 'brl',
-      then: (schema) =>
-        schema
-          .required(t('components.swap.validation.pixId.required'))
-          .test('matches-one', t('components.swap.validation.pixId.format'), (value) => {
-            if (!value) return false;
-            return pixKeyRegex.some((regex) => regex.test(value));
-          }),
-      otherwise: (schema) => schema.optional(),
-    }),
-  });
-};
diff --git a/frontend/src/components/Ramp/Offramp/index.tsx b/frontend/src/components/Ramp/Offramp/index.tsx
index 4b978fb87..ac982848a 100644
--- a/frontend/src/components/Ramp/Offramp/index.tsx
+++ b/frontend/src/components/Ramp/Offramp/index.tsx
@@ -24,6 +24,7 @@ import { RampFeeCollapse } from '../../RampFeeCollapse';
 import { RampSubmitButtons } from '../../RampSubmitButtons';
 import { useQuoteService } from '../../../hooks/ramp/useQuoteService';
 import { useTranslation } from 'react-i18next';
+import { useInitializeFailedMessage } from '../../../stores/rampStore';
 
 export const Offramp = () => {
   const { t } = useTranslation();
@@ -42,7 +43,8 @@ export const Offramp = () => {
     form.setValue('outputAmount', toAmount?.toString() || '0');
   }, [toAmount, form]);
 
-  const { getCurrentErrorMessage, initializeFailedMessage } = useRampValidation();
+  const { getCurrentErrorMessage } = useRampValidation();
+  const initializeFailedMessage = useInitializeFailedMessage()
   const { onRampConfirm } = useRampSubmission();
   const validateTerms = useValidateTerms();
 
diff --git a/frontend/src/components/Ramp/Onramp/index.tsx b/frontend/src/components/Ramp/Onramp/index.tsx
index 6ac665f01..485f78c47 100644
--- a/frontend/src/components/Ramp/Onramp/index.tsx
+++ b/frontend/src/components/Ramp/Onramp/index.tsx
@@ -23,6 +23,7 @@ import { useInputAmount, useOnChainToken, useFiatToken } from '../../../stores/r
 import { useRampUrlParams } from '../../../hooks/useRampUrlParams';
 import { RampFeeCollapse } from '../../RampFeeCollapse';
 import { RampSubmitButtons } from '../../RampSubmitButtons';
+import { useInitializeFailedMessage } from '../../../stores/rampStore';
 
 export const Onramp = () => {
   const { t } = useTranslation();
@@ -43,7 +44,8 @@ export const Onramp = () => {
     form.setValue('outputAmount', toAmount?.toString() || '0');
   }, [toAmount, form]);
 
-  const { getCurrentErrorMessage, initializeFailedMessage } = useRampValidation();
+  const { getCurrentErrorMessage } = useRampValidation();
+  const initializeFailedMessage = useInitializeFailedMessage()
   const validateTerms = useValidateTerms();
   const { onRampConfirm } = useRampSubmission();
 
diff --git a/frontend/src/components/RampSubmitButtons/index.tsx b/frontend/src/components/RampSubmitButtons/index.tsx
index 0ed37ac86..6e9013a84 100644
--- a/frontend/src/components/RampSubmitButtons/index.tsx
+++ b/frontend/src/components/RampSubmitButtons/index.tsx
@@ -2,7 +2,7 @@ import { FC, useCallback } from 'react';
 import Big from 'big.js';
 import { useEventsContext } from '../../contexts/events';
 import { useFeeComparisonStore } from '../../stores/feeComparison';
-import { useRampSummaryVisible } from '../../stores/rampStore';
+import { useInitializeFailedMessage, useRampSummaryVisible } from '../../stores/rampStore';
 import { useRampValidation } from '../../hooks/ramp/useRampValidation';
 import { SwapSubmitButton } from '../buttons/SwapSubmitButton';
 import { useFiatToken, useInputAmount, useOnChainToken } from '../../stores/ramp/useRampFormStore';
@@ -19,7 +19,8 @@ export const RampSubmitButtons: FC<RampSubmitButtonsProps> = ({ toAmount }) => {
 
   const { feeComparisonRef } = useFeeComparisonStore();
   const { trackEvent } = useEventsContext();
-  const { getCurrentErrorMessage, initializeFailedMessage } = useRampValidation();
+  const { getCurrentErrorMessage } = useRampValidation();
+  const initializeFailedMessage = useInitializeFailedMessage();
   const isRampSummaryDialogVisible = useRampSummaryVisible();
   const inputAmount = useInputAmount();
   const fiatToken = useFiatToken();
diff --git a/frontend/src/contexts/network.tsx b/frontend/src/contexts/network.tsx
index 83844c8a4..7c512a835 100644
--- a/frontend/src/contexts/network.tsx
+++ b/frontend/src/contexts/network.tsx
@@ -1,4 +1,4 @@
-import { createContext, ReactNode, useContext, useState, useEffect, useCallback } from 'react';
+import { createContext, ReactNode, useContext, useState, useCallback } from 'react';
 import { useAccount, useSwitchChain } from 'wagmi';
 import { useLocalStorage, LocalStorageKeys } from '../hooks/useLocalStorage';
 import { WALLETCONNECT_ASSETHUB_ID } from '../constants/constants';
@@ -6,6 +6,20 @@ import { useRampActions } from '../stores/rampStore';
 import { getNetworkId, isNetworkEVM, Networks } from 'shared';
 import { useSep24Actions } from '../stores/sep24Store';
 
+const getParamsNetwork = () => {
+  const params = new URLSearchParams(window.location.search);
+  const networkParam = params.get('network')?.toLowerCase();
+
+  if (networkParam) {
+    const matchedNetwork = Object.values(Networks).find((network) => network.toLowerCase() === networkParam);
+
+    if (matchedNetwork) {
+      return matchedNetwork;
+    }
+  }
+  return null;
+};
+
 interface NetworkContextType {
   walletConnectPolkadotSelectedNetworkId: string;
   selectedNetwork: Networks;
@@ -34,7 +48,9 @@ export const NetworkProvider = ({ children }: NetworkProviderProps) => {
   // We do this to ensure that the local storage value is always in lowercase. Previously the first letter was uppercase
   const selectedNetworkLocalStorage = selectedNetworkLocalStorageState.toLowerCase() as Networks;
 
-  const [selectedNetwork, setSelectedNetworkState] = useState<Networks>(selectedNetworkLocalStorage);
+  const paramsNetwork = getParamsNetwork();
+
+  const [selectedNetwork, setSelectedNetworkState] = useState<Networks>(paramsNetwork || selectedNetworkLocalStorage);
   const [networkSelectorDisabled, setNetworkSelectorDisabled] = useState(false);
 
   const { resetRampState } = useRampActions();
@@ -63,19 +79,6 @@ export const NetworkProvider = ({ children }: NetworkProviderProps) => {
     [connectedEvmChain, switchChainAsync, setSelectedNetworkLocalStorage, resetRampState, cleanupSep24Variables],
   );
 
-  useEffect(() => {
-    const params = new URLSearchParams(window.location.search);
-    const networkParam = params.get('network')?.toLowerCase();
-
-    if (networkParam) {
-      const matchedNetwork = Object.values(Networks).find((network) => network.toLowerCase() === networkParam);
-
-      if (matchedNetwork) {
-        setSelectedNetwork(matchedNetwork);
-      }
-    }
-  }, [setSelectedNetwork]);
-
   return (
     <NetworkContext
       value={{
diff --git a/frontend/src/hooks/offramp/useSubmitRamp.ts b/frontend/src/hooks/offramp/useSubmitRamp.ts
index ecc347cf9..ab4e614b2 100644
--- a/frontend/src/hooks/offramp/useSubmitRamp.ts
+++ b/frontend/src/hooks/offramp/useSubmitRamp.ts
@@ -6,7 +6,13 @@ import { useVortexAccount } from '../useVortexAccount';
 import { useNetwork } from '../../contexts/network';
 import { useEventsContext } from '../../contexts/events';
 import { useSiweContext } from '../../contexts/siwe';
-import { FiatToken, getAnyFiatTokenDetails, getOnChainTokenDetailsOrDefault, getTokenDetailsSpacewalk } from 'shared';
+import {
+  BrlaEndpoints,
+  FiatToken,
+  getAnyFiatTokenDetails,
+  getOnChainTokenDetailsOrDefault,
+  getTokenDetailsSpacewalk,
+} from 'shared';
 import { fetchTomlValues } from '../../services/stellar';
 import { sep24First } from '../../services/anchor/sep24/first';
 import { sep10 } from '../../services/anchor/sep10';
@@ -15,6 +21,8 @@ import { useSep24Actions } from '../../stores/sep24Store';
 import { SIGNING_SERVICE_URL } from '../../constants/constants';
 import { RampExecutionInput } from '../../types/phases';
 import { useToastMessage } from '../../helpers/notifications';
+import { isValidCnpj, isValidCpf } from '../ramp/schema';
+import { BrlaService } from '../../services/api';
 
 export const useSubmitRamp = () => {
   const { t } = useTranslation();
@@ -78,15 +86,31 @@ export const useSubmitRamp = () => {
               return;
             }
 
-            const response = await fetch(`${SIGNING_SERVICE_URL}/v1/brla/getUser?taxId=${taxId}`);
-            if (!response.ok) {
+            try {
+              const { evmAddress: brlaEvmAddress } = await BrlaService.getUser(taxId);
+
+              // append EVM address to execution input
+              const updatedBrlaRampExecution = { ...executionInput, brlaEvmAddress };
+              setRampExecutionInput(updatedBrlaRampExecution);
+
+              setRampSummaryVisible(true);
+            } catch (err) {
+              const errorResponse = err as BrlaEndpoints.BrlaErrorResponse;
+
               // Response can also fail due to invalid KYC. Nevertheless, this should never be the case, as when we create the user we wait for the KYC
               // to be valid, or retry.
-              if (response.status === 404) {
+              if (isValidCpf(taxId)) {
                 console.log("User doesn't exist yet.");
                 setRampKycStarted(true);
                 return;
-              } else if ((await response.text()).includes('KYC invalid')) {
+              } else if (isValidCnpj(taxId)) {
+                console.log("CNPJ User doesn't exist yet.");
+                setInitializeFailedMessage(t('hooks.useSubmitOfframp.cnpjUserDoesntExist'));
+                setRampStarted(false);
+                setRampInitiating(false);
+                cleanupSEP24();
+                return;
+              } else if (errorResponse.error.includes('KYC invalid')) {
                 setInitializeFailedMessage(t('hooks.useSubmitOfframp.kycInvalid'));
                 setRampStarted(false);
                 setRampInitiating(false);
@@ -94,13 +118,6 @@ export const useSubmitRamp = () => {
                 return;
               }
               throw new Error('Error while fetching BRLA user');
-            } else {
-              const { evmAddress: brlaEvmAddress } = await response.json();
-              // append EVM address to execution input
-              const updatedBrlaRampExecution = { ...executionInput, brlaEvmAddress };
-              setRampExecutionInput(updatedBrlaRampExecution);
-
-              setRampSummaryVisible(true);
             }
           } else {
             const stellarEphemeralSecret = executionInput.ephemerals.stellarEphemeral.secret;
diff --git a/frontend/src/hooks/ramp/schema.ts b/frontend/src/hooks/ramp/schema.ts
new file mode 100644
index 000000000..0d650e09b
--- /dev/null
+++ b/frontend/src/hooks/ramp/schema.ts
@@ -0,0 +1,82 @@
+import * as Yup from 'yup';
+import { useTranslation } from 'react-i18next';
+
+import { OnChainToken, FiatToken } from 'shared';
+import { RampDirection } from '../../components/RampToggle';
+import { useRampDirection } from '../../stores/rampDirectionStore';
+
+export type RampFormValues = {
+  inputAmount: string;
+  outputAmount?: string;
+  onChainToken: OnChainToken;
+  fiatToken: FiatToken;
+  slippage?: number;
+  deadline?: number;
+  taxId?: string;
+  pixId?: string;
+};
+
+const transformNumber = (value: unknown, originalValue: unknown) => {
+  if (!originalValue) return 0;
+  if (typeof originalValue === 'string' && originalValue !== '') value = Number(originalValue) ?? 0;
+  return value;
+};
+
+const cpfRegex = /^\d{3}(\.\d{3}){2}-\d{2}$|^\d{11}$/;
+const cnpjRegex = /^(\d{2}\.?\d{3}\.?\d{3}\/?\d{4}-?\d{2})$/;
+
+export function isValidCnpj(cnpj: string): boolean {
+  return cnpjRegex.test(cnpj);
+}
+
+export function isValidCpf(cpf: string): boolean {
+  return cpfRegex.test(cpf);
+}
+
+// Regex adopted from here https://developers.international.pagseguro.com/reference/pix-key-validation-and-regex-1
+const pixKeyRegex = [
+  cpfRegex,
+  /^\+[1-9][0-9]\d{1,14}$/, // Phone
+  /^(([^<>()[\]\\.,;:\s@"]+(.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, // Email
+  /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/, // Random
+];
+
+export const createRampFormSchema = (t: (key: string) => string, rampDirection: RampDirection) => {
+  return Yup.object<RampFormValues>().shape({
+    inputAmount: Yup.string().required(t('components.swap.validation.inputAmount.required')),
+    outputAmount: Yup.string().optional(),
+    onChainToken: Yup.mixed<OnChainToken>().required(t('components.swap.validation.onChainToken.required')),
+    fiatToken: Yup.mixed<FiatToken>().required(t('components.swap.validation.fiatToken.required')),
+    slippage: Yup.number().transform(transformNumber),
+    deadline: Yup.number().transform(transformNumber),
+    taxId: Yup.string().when('fiatToken', {
+      is: (value: FiatToken) => value === FiatToken.BRL,
+      then: (schema) =>
+        schema
+          .required(t('components.swap.validation.taxId.required'))
+          .test('matches-one', t('components.swap.validation.taxId.format'), (value) => {
+            if (!value) return false;
+            return isValidCnpj(value) || isValidCpf(value);
+          }),
+      otherwise: (schema) => schema.optional(),
+    }),
+    pixId: Yup.string().when('fiatToken', {
+      is: (value: FiatToken) => value === FiatToken.BRL && rampDirection === RampDirection.OFFRAMP,
+      then: (schema) =>
+        schema
+          .required(t('components.swap.validation.pixId.required'))
+          .test('matches-one', t('components.swap.validation.pixId.format'), (value) => {
+            if (!value) return false;
+            return pixKeyRegex.some((regex) => regex.test(value));
+          }),
+      otherwise: (schema) => schema.optional(),
+    }),
+  });
+};
+
+export const useSchema = () => {
+  const { t } = useTranslation();
+  const rampDirection = useRampDirection();
+
+  return createRampFormSchema(t, rampDirection);
+};
diff --git a/frontend/src/hooks/ramp/useRampForm.ts b/frontend/src/hooks/ramp/useRampForm.ts
index 59eefc2c0..1e68fe084 100644
--- a/frontend/src/hooks/ramp/useRampForm.ts
+++ b/frontend/src/hooks/ramp/useRampForm.ts
@@ -1,8 +1,9 @@
 import { useForm, UseFormReturn } from 'react-hook-form';
 import { useEffect, useCallback } from 'react';
 import { FiatToken } from 'shared';
+import { yupResolver } from '@hookform/resolvers/yup';
 
-import { RampFormValues } from '../../components/Nabla/schema';
+import { RampFormValues, useSchema } from './schema';
 import {
   DEFAULT_RAMP_FORM_STORE_VALUES,
   useFiatToken,
@@ -27,10 +28,15 @@ export const useRampForm = (): {
   form: UseFormReturn<RampFormValues>;
   reset: () => void;
 } => {
+  const formSchema = useSchema();
+
   const form = useForm<RampFormValues>({
+    resolver: yupResolver(formSchema),
     defaultValues: DEFAULT_RAMP_FORM_VALUES,
   });
 
+  console.log('form', form.formState.errors);
+
   const taxId = useTaxId();
   const pixId = usePixId();
   const inputAmount = useInputAmount();
diff --git a/frontend/src/hooks/ramp/useRampValidation.ts b/frontend/src/hooks/ramp/useRampValidation.ts
index 80f0580c5..4ab4126e5 100644
--- a/frontend/src/hooks/ramp/useRampValidation.ts
+++ b/frontend/src/hooks/ramp/useRampValidation.ts
@@ -144,7 +144,6 @@ export const useRampValidation = () => {
   const { isDisconnected } = useVortexAccount();
 
   const inputAmount = useMemo(() => Big(inputAmountString || '0'), [inputAmountString]);
-  const [initializeFailedMessage, setInitializeFailedMessage] = useState<string | null>(null);
 
   const fromToken = isOnramp
     ? getAnyFiatTokenDetails(fiatToken)
@@ -198,17 +197,8 @@ export const useRampValidation = () => {
     userInputTokenBalance?.balance,
   ]);
 
-  const setInitializeFailed = useCallback((message?: string | null) => {
-    setInitializeFailedMessage(
-      message ??
-        "We're experiencing a digital traffic jam. Please hold tight while we clear the road and get things moving again!",
-    );
-  }, []);
-
   return {
     getCurrentErrorMessage,
-    initializeFailedMessage,
-    setInitializeFailed,
     isValid: !getCurrentErrorMessage(),
   };
 };
diff --git a/frontend/src/hooks/useRampUrlParams.ts b/frontend/src/hooks/useRampUrlParams.ts
index 5f34e1f6a..2c99d2e28 100644
--- a/frontend/src/hooks/useRampUrlParams.ts
+++ b/frontend/src/hooks/useRampUrlParams.ts
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { UseFormReturn } from 'react-hook-form';
-import { RampFormValues } from '../components/Nabla/schema';
 import { FiatToken } from 'shared';
+import { RampFormValues } from './ramp/schema';
 
 interface UseRampUrlParamsProps {
   form: UseFormReturn<RampFormValues, unknown, undefined>;
diff --git a/frontend/src/sections/PopularTokens/index.tsx b/frontend/src/sections/PopularTokens/index.tsx
index f6ff9bb7f..429cbd5fa 100644
--- a/frontend/src/sections/PopularTokens/index.tsx
+++ b/frontend/src/sections/PopularTokens/index.tsx
@@ -13,6 +13,9 @@ const tokens: Array<{ name: string; assetIcon: string }> = [
   { name: 'USDC', assetIcon: 'usdc' },
   { name: 'USDC.e', assetIcon: 'usdc' },
   { name: 'USDT', assetIcon: 'usdt' },
+  { name: 'BRLA', assetIcon: 'brl' },
+  { name: 'ARS', assetIcon: 'ars' },
+  { name: 'EURC', assetIcon: 'eurc' },
 ];
 
 const networks = Object.values(Networks).filter(
diff --git a/frontend/src/translations/en.json b/frontend/src/translations/en.json
index 20513f23e..c53158202 100644
--- a/frontend/src/translations/en.json
+++ b/frontend/src/translations/en.json
@@ -77,7 +77,7 @@
   },
   "sections": {
     "whyVortex": {
-      "title": "Sell Crypto the secure Way",
+      "title": "Buy & Sell Crypto the secure Way",
       "description": "Vortex is a non-custodial exchange that allows you to swap between different cryptocurrencies. It is built on top of the Stellar blockchain and uses the Stellar SDK to interact with the Stellar network.",
       "features": {
         "lowFees": {
@@ -86,7 +86,7 @@
         },
         "easyToUse": {
           "title": "Easy to Use",
-          "description": "Sell your crypto easily without the need for a centralized exchange."
+          "description": "Buy & Sell your crypto easily without the need for a centralized exchange."
         },
         "securityFirst": {
           "title": "Security First, Always",
@@ -114,7 +114,7 @@
       }
     },
     "pitch": {
-      "title": "Sell <1>Stablecoins</1> and receive <br class='hidden sm:block' /> the money directly in your Bank Account",
+      "title": "Buy & Sell <1>Stablecoins</1> - <br class='hidden sm:block' /> directly with your Bank Account",
       "description": "Complete everything in one simple step. With our trusted local partners, <br class='hidden sm:block' /> enjoy fast, secure transactions and the best rates in the market."
     },
     "howToSell": {
@@ -263,13 +263,23 @@
       "compareFees": "Compare fees",
       "validation": {
         "taxId": {
-          "required": "CPF is required when transferring BRL",
-          "format": "Invalid CPF"
+          "required": "CPF or CNPJ is required when transferring BRL",
+          "format": "Invalid CPF or CNPJ format"
         },
         "pixId": {
           "required": "PIX key is required when transferring BRL",
           "format": "PIX key does not match any of the valid formats"
         },
+        "inputAmount": {
+          "required": "Amount is required",
+          "format": "Invalid amount format"
+        },
+        "onChainToken": {
+          "required": "Token is required"
+        },
+        "fiatToken": {
+          "required": "Fiat token is required"
+        },
         "calculatingQuote": "Calculating quote...",
         "assetHubNotSupported": "Please select a different network. Buy is currently not available on AssetHub."
       }
@@ -281,7 +291,9 @@
     "brlaSwapField": {
       "placeholder": "Enter your {{label}}",
       "disclaimerOfframp": "CPF and Pix key need to belong to the <1>same person</1>.",
-      "disclaimerOnramp": "CPF must belong to <1>you</1>."
+      "disclaimerOnramp": "CPF must belong to <1>you</1>.",
+      "cpfOrCnpj": "CPF or CNPJ",
+      "pixKey": "Pix key"
     },
     "swapSubmitButton": {
       "confirming": "Confirming",
@@ -303,8 +315,8 @@
       "transactionId": "Transaction ID"
     },
     "brlaKYCForm": {
-      "title": "KYC Details",
-      "description": "KYC verification is required to complete your transaction. The information you provide is processed securely by our local partner ",
+      "title": "Fast-Track Verification",
+      "description": "Complete these quick identity checks (typically 90 seconds). Data is processed securely by <a>BRLA</a> using bank-grade encryption for transaction security.",
       "buttons": {
         "back": "Back",
         "finish": "Finish",
@@ -384,7 +396,8 @@
       "default": "Something went wrong"
     },
     "useSubmitOfframp": {
-      "kycInvalid": "Your KYC level is invalid. Please contact support."
+      "kycInvalid": "Your KYC level is invalid. Please contact support.",
+      "cnpjUserDoesntExist": "Please contact our support team at support@vortexfinance.co to get onboarded as a business user."
     }
   },
   "toasts": {
diff --git a/frontend/src/translations/pt.json b/frontend/src/translations/pt.json
index e17c616bb..7cc1f0be1 100644
--- a/frontend/src/translations/pt.json
+++ b/frontend/src/translations/pt.json
@@ -77,7 +77,7 @@
   },
   "sections": {
     "whyVortex": {
-      "title": "Venda criptomoedas com segurança",
+      "title": "Compre e Venda criptomoedas com segurança",
       "description": "A Vortex é uma plataforma de troca não custodial, permitindo que você negocie diversas criptomoedas com facilidade.",
       "features": {
         "lowFees": {
@@ -86,7 +86,7 @@
         },
         "easyToUse": {
           "title": "Simples de usar",
-          "description": "Venda suas criptomoedas facilmente sem a necessidade de uma exchange centralizada."
+          "description": "Compre e Venda suas criptomoedas facilmente sem a necessidade de uma exchange centralizada."
         },
         "securityFirst": {
           "title": "Priorizamos sua segurança acima de tudo",
@@ -114,7 +114,7 @@
       }
     },
     "pitch": {
-      "title": "Venda <1>Stablecoins</1> e receba <br class='hidden sm:block' /> o dinheiro diretamente na sua Conta Bancária",
+      "title": "Compre e Venda <1>Stablecoins</1> - <br class='hidden sm:block' /> diretamente com sua conta bancária",
       "description": "Complete tudo em uma única etapa simples. Com nossos parceiros locais confiáveis, <br class='hidden sm:block' /> desfrute de transações rápidas, seguras e as melhores taxas do mercado."
     },
     "howToSell": {
@@ -262,13 +262,23 @@
       "compareFees": "Comparar taxas",
       "validation": {
         "taxId": {
-          "required": "CPF é obrigatório para transferências em BRL",
-          "format": "CPF inválido"
+          "required": "CPF o CNPJ é obrigatório para transferências em BRL",
+          "format": "CPF o CNPJ inválido"
         },
         "pixId": {
           "required": "Chave PIX é obrigatória para transferências em BRL",
           "format": "A chave PIX não corresponde a nenhum dos formatos válidos"
         },
+        "inputAmount": {
+          "required": "Valor é obrigatório",
+          "format": "Formato de valor inválido"
+        },
+        "onChainToken": {
+          "required": "Token é obrigatório"
+        },
+        "fiatToken": {
+          "required": "Token fiat é obrigatório"
+        },
         "calculatingQuote": "Calculando cotação...",
         "assetHubNotSupported": "Por favor, selecione uma rede diferente. A compra não está disponível no momento no AssetHub."
       }
@@ -280,7 +290,9 @@
     "brlaSwapField": {
       "placeholder": "Digite seu {{label}}",
       "disclaimerOfframp": "CPF e chave Pix precisam pertencer à <1>mesma pessoa</1>.",
-      "disclaimerOnramp": "CPF deve pertencer a <1>você</1>."
+      "disclaimerOnramp": "CPF deve pertencer a <1>você</1>.",
+      "cpfOrCnpj": "CPF o CNPJ",
+      "pixKey": "Chave Pix"
     },
     "swapSubmitButton": {
       "confirming": "Confirmando",
@@ -302,8 +314,8 @@
       "transactionId": "ID da transação"
     },
     "brlaKYCForm": {
-      "title": "Detalhes KYC",
-      "description": "A verificação KYC é necessária para completar sua transação. As informações fornecidas são processadas com segurança pelo nosso parceiro local ",
+      "title": "Verificação Rápida",
+      "description": "Complete estas verificações rápidas de identidade (normalmente 90 segundos). Os dados são processados com segurança pela <a>BRLA</a> usando criptografia de nível bancário para segurança da transação.",
       "buttons": {
         "back": "Voltar",
         "finish": "Finalizar",
@@ -383,7 +395,8 @@
       "default": "Algo deu errado"
     },
     "useSubmitOfframp": {
-      "kycInvalid": "Seu nível de KYC é inválido. Por favor, entre em contato com o suporte."
+      "kycInvalid": "Seu nível de KYC é inválido. Por favor, entre em contato com o suporte.",
+      "cnpjUserDoesntExist": "Entre em contato com nossa equipe de suporte em support@vortexfinance.co para começar como usuário empresarial."
     }
   },
   "toasts": {