diff --git a/contexts/LeveragerContext.tsx b/contexts/LeveragerContext.tsx
index d7c0eb949..89b659db4 100644
--- a/contexts/LeveragerContext.tsx
+++ b/contexts/LeveragerContext.tsx
@@ -55,6 +55,7 @@ import { debtManagerABI } from 'types/abi';
 import useStETHNativeAPR from 'hooks/useStETHNativeAPR';
 import useIsPermit from 'hooks/useIsPermit';
 import { gasLimit } from 'utils/gas';
+import useContractVersion from 'hooks/useContractVersion';
 
 type Params<T extends ExtractAbiFunctionNames<typeof debtManagerABI>> = AbiParametersToPrimitiveTypes<
   ExtractAbiFunction<typeof debtManagerABI, T>['inputs']
@@ -198,6 +199,7 @@ export const LeveragerContextProvider: FC<PropsWithChildren> = ({ children }) =>
   const stETHNativeAPR = useStETHNativeAPR();
 
   const minLeverageRatio = 1;
+  const contractVersion = useContractVersion();
 
   const [leverageStatus, setLeverageStatus] = useState<LeverageStatus>();
 
@@ -391,8 +393,14 @@ export const LeveragerContextProvider: FC<PropsWithChildren> = ({ children }) =>
   );
 
   const setCollateralSymbol = useCallback(
-    (collateralSymbol: string) => setBorrowSymbol(collateralSymbol),
-    [setBorrowSymbol],
+    (collateralSymbol: string) => {
+      const marketAccount = getMarketAccount(collateralSymbol);
+      setBorrowSymbol(collateralSymbol);
+      if (marketAccount && !marketAccount.isCollateral) {
+        return setErrorData({ status: true, message: t('Please set this asset as collateral in your dashboard') });
+      }
+    },
+    [getMarketAccount, setBorrowSymbol, t],
   );
 
   const setSecondaryOperation = useCallback((secondaryOperation: 'deposit' | 'withdraw') => {
@@ -798,7 +806,7 @@ export const LeveragerContextProvider: FC<PropsWithChildren> = ({ children }) =>
         primaryType: 'Permit',
         domain: {
           name: who.startsWith('market') ? '' : await assetIn.read.name(opts),
-          version: '1',
+          version: await contractVersion(verifyingContract),
           chainId: chain.id,
           verifyingContract,
         },
@@ -832,6 +840,7 @@ export const LeveragerContextProvider: FC<PropsWithChildren> = ({ children }) =>
     [
       assetIn,
       chain.id,
+      contractVersion,
       debtManager,
       isPermit,
       maIn,
diff --git a/contexts/OperationContext.tsx b/contexts/OperationContext.tsx
index d390683fb..fc19d3652 100644
--- a/contexts/OperationContext.tsx
+++ b/contexts/OperationContext.tsx
@@ -122,6 +122,7 @@ export const OperationContextProvider: FC<PropsWithChildren<Props>> = ({ args, c
   const marketContract = useMarket(marketAccount?.market);
   const ETHRouterContract = useETHRouter();
   const { installmentsOptions, installmentsDetails } = useInstallmentsData({
+    operation,
     qty,
     date,
     symbol: marketSymbol,
diff --git a/hooks/useInstallmentsData.ts b/hooks/useInstallmentsData.ts
index 6e07316b5..b6dae7d7a 100644
--- a/hooks/useInstallmentsData.ts
+++ b/hooks/useInstallmentsData.ts
@@ -6,13 +6,16 @@ import globalUtilization from '@exactly/lib/esm/interest-rate-model/globalUtiliz
 import useAccountData from 'hooks/useAccountData';
 import { INTERVAL } from 'utils/utils';
 import useIRM from 'hooks/useIRM';
+import { Operation } from 'types/Operation';
 
 export default function useInstallmentsData({
+  operation,
   qty,
   date,
   symbol,
   installments,
 }: {
+  operation: Operation;
   qty: string;
   date?: bigint;
   symbol: string;
@@ -23,7 +26,13 @@ export default function useInstallmentsData({
 
   const getDetails = useCallback(
     (amount: bigint, installments_: bigint, firstMaturity: bigint) => {
-      if (amount === 0n || irmParameters === undefined || marketAccount === undefined) return;
+      if (
+        amount === 0n ||
+        irmParameters === undefined ||
+        marketAccount === undefined ||
+        operation !== 'borrowAtMaturity'
+      )
+        return;
       const {
         floatingUtilization,
         totalFloatingBorrowAssets,
@@ -66,7 +75,7 @@ export default function useInstallmentsData({
         effectiveRate,
       };
     },
-    [irmParameters, marketAccount],
+    [irmParameters, marketAccount, operation],
   );
 
   const installmentsOptions = useMemo(() => {
diff --git a/i18n/es/translation.json b/i18n/es/translation.json
index b8825c145..1ecbc962f 100644
--- a/i18n/es/translation.json
+++ b/i18n/es/translation.json
@@ -632,5 +632,6 @@
   " In {{installments}} installments": "En {{installments}} cuotas",
   "Repay Amount": "Monto a Pagar",
   "Join the waitlist": "Únete a la lista de espera",
-  "The first onchain debit & credit card.": "La primer tarjeta de débito y crédito onchain."
+  "The first onchain debit & credit card.": "La primer tarjeta de débito y crédito onchain.",
+  "Please set this asset as collateral in your dashboard": "Por favor, establece este activo como colateral en tu panel de control"
 }