diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
index f7f8b933bf..cb4cd8430b 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
@@ -213,7 +213,7 @@ abstract class BankForm extends GeneralBankForm {
             addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode),
                     bankAccountPayload.getAccountType()).second.setMouseTransparent(false);
 
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
@@ -275,7 +275,7 @@ abstract class BankForm extends GeneralBankForm {
             }
         });
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         updateFromInputs();
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashAppForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashAppForm.java
index a17906ec6e..de4e8dd874 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashAppForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashAppForm.java
@@ -70,7 +70,7 @@ public class CashAppForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -89,7 +89,7 @@ public class CashAppForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
index 2adcd0bc59..ace51f1dfb 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
@@ -243,7 +243,7 @@ public class CashDepositForm extends GeneralBankForm {
             textArea.setText(requirements);
         }
 
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
@@ -310,7 +310,7 @@ public class CashDepositForm extends GeneralBankForm {
             updateFromInputs();
         });
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         updateFromInputs();
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
index 00f38c69f6..291358e60b 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
@@ -81,7 +81,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = chaseQuickPayAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -105,7 +105,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = chaseQuickPayAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
index cc2f5c6730..9ecde3e17e 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
@@ -81,7 +81,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -106,7 +106,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CryptoCurrencyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CryptoCurrencyForm.java
index b7292b6a64..a0dd1c5473 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CryptoCurrencyForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CryptoCurrencyForm.java
@@ -99,7 +99,7 @@ public class CryptoCurrencyForm extends PaymentMethodForm {
             updateFromInputs();
         });
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -138,7 +138,7 @@ public class CryptoCurrencyForm extends PaymentMethodForm {
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.altcoin"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java
index 111bae1988..5ead5ebc66 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java
@@ -118,7 +118,7 @@ public class F2FForm extends PaymentMethodForm {
             updateFromInputs();
         });
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -168,7 +168,7 @@ public class F2FForm extends PaymentMethodForm {
         textArea.setPrefHeight(60);
         textArea.setEditable(false);
 
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
index ba8f48b3f0..cdeb6aaceb 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
@@ -86,7 +86,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -110,7 +110,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = fasterPaymentsAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java
index 06fa941ff4..b32d0704b3 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java
@@ -39,7 +39,7 @@ abstract public class GeneralAccountNumberForm extends PaymentMethodForm {
 
         addTradeCurrency();
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -83,6 +83,6 @@ abstract public class GeneralAccountNumberForm extends PaymentMethodForm {
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
 
-        addLimitations();
+        addLimitations(true);
     }
 }
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java
index ba02fec4bb..1fb08de78c 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java
@@ -72,7 +72,7 @@ public class HalCashForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = halCashAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -94,7 +94,7 @@ public class HalCashForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = halCashAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
index d335548a38..ffe20fccb4 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
@@ -99,7 +99,7 @@ public class InteracETransferForm extends PaymentMethodForm {
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -127,7 +127,7 @@ public class InteracETransferForm extends PaymentMethodForm {
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
index b45d177974..39e741f2bc 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
@@ -69,7 +69,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -88,7 +88,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java
index e4034536ab..a6e0a2c2c2 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java
@@ -96,7 +96,7 @@ public class MoneyGramForm extends PaymentMethodForm {
                     moneyGramAccountPayload.getState()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 moneyGramAccountPayload.getEmail());
-        addLimitations();
+        addLimitations(true);
         addCurrenciesGrid(false);
     }
 
@@ -130,7 +130,7 @@ public class MoneyGramForm extends PaymentMethodForm {
         emailInputTextField.setValidator(emailValidator);
 
         addCurrenciesGrid(true);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         updateFromInputs();
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java
index 417713addf..8e1a74e9d4 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/OKPayForm.java
@@ -83,7 +83,7 @@ public class OKPayForm extends PaymentMethodForm {
         });
 
         addCurrenciesGrid(true);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -128,7 +128,7 @@ public class OKPayForm extends PaymentMethodForm {
         TextField field = FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.wallet"),
                 okPayAccount.getAccountNr()).second;
         field.setMouseTransparent(false);
-        addLimitations();
+        addLimitations(true);
         addCurrenciesGrid(false);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
index bde1413b3a..08efe3f194 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
@@ -76,8 +76,8 @@ public abstract class PaymentMethodForm {
     protected final BooleanProperty allInputsValid = new SimpleBooleanProperty();
 
     protected int gridRowFrom;
-    protected InputTextField accountNameTextField;
-    protected ToggleButton useCustomAccountNameToggleButton;
+    InputTextField accountNameTextField;
+    ToggleButton useCustomAccountNameToggleButton;
     protected ComboBox<TradeCurrency> currencyComboBox;
 
     public PaymentMethodForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService,
@@ -155,7 +155,7 @@ public abstract class PaymentMethodForm {
         return time;
     }
 
-    protected void addLimitations() {
+    protected void addLimitations(boolean isDisplayForm) {
         long hours = paymentAccount.getPaymentMethod().getMaxTradePeriod() / 3600_000;
 
         final TradeCurrency tradeCurrency;
@@ -183,7 +183,11 @@ public abstract class PaymentMethodForm {
                         getTimeText(hours),
                         formatter.formatCoinWithCode(Coin.valueOf(accountAgeWitnessService.getMyTradeLimit(paymentAccount, tradeCurrency.getCode()))),
                         formatter.formatAccountAge(accountAge));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.limitations"), limitationsText);
+
+        if (isDisplayForm)
+            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.limitations"), limitationsText);
+        else
+            addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.limitations"), limitationsText);
 
         if (isAddAccountScreen) {
             InputTextField inputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.salt"), 0);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
index f98e5905ed..a5c629e91a 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
@@ -79,7 +79,7 @@ public class PopmoneyForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -100,7 +100,7 @@ public class PopmoneyForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java
index 5960a23d36..7ddeb92d14 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java
@@ -72,7 +72,7 @@ public class PromptPayForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = promptPayAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -94,7 +94,7 @@ public class PromptPayForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = promptPayAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
index 4386b4a148..df6fc0acd1 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
@@ -73,7 +73,7 @@ public class RevolutForm extends PaymentMethodForm {
         });
 
         addCurrenciesGrid(true);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -105,7 +105,7 @@ public class RevolutForm extends PaymentMethodForm {
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.revolut.accountId"),
                 account.getAccountId()).second;
         field.setMouseTransparent(false);
-        addLimitations();
+        addLimitations(true);
         addCurrenciesGrid(false);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
index 6f535f2465..f801148974 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
@@ -115,7 +115,7 @@ public class SepaForm extends GeneralSepaForm {
 
         addEuroCountriesGrid();
         addNonEuroCountriesGrid();
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaCountries()));
@@ -207,7 +207,7 @@ public class SepaForm extends GeneralSepaForm {
             acceptedCountries.setMouseTransparent(false);
             acceptedCountries.setTooltip(tooltip);
         }
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
index 347b127e4c..f2867f2615 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
@@ -115,7 +115,7 @@ public class SepaInstantForm extends GeneralSepaForm {
 
         addEuroCountriesGrid();
         addNonEuroCountriesGrid();
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaInstantCountries()));
@@ -206,7 +206,7 @@ public class SepaInstantForm extends GeneralSepaForm {
             acceptedCountries.setMouseTransparent(false);
             acceptedCountries.setTooltip(tooltip);
         }
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
index 61f689cb71..4a64ef7589 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
@@ -87,7 +87,7 @@ public class SwishForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = swishAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -111,7 +111,7 @@ public class SwishForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = swishAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
index c22c43253d..41420a6368 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
@@ -88,7 +88,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
                 nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -113,7 +113,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
         TradeCurrency singleTradeCurrency = usPostalMoneyOrderAccount.getSingleTradeCurrency();
         String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
index ffc2e7e4a9..2ee6dae511 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
@@ -72,7 +72,7 @@ public class UpholdForm extends PaymentMethodForm {
         });
 
         addCurrenciesGrid(true);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -105,7 +105,7 @@ public class UpholdForm extends PaymentMethodForm {
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.uphold.accountId"),
                 upholdAccount.getAccountId()).second;
         field.setMouseTransparent(false);
-        addLimitations();
+        addLimitations(true);
         addCurrenciesGrid(false);
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VenmoForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/VenmoForm.java
index 4d2b8d7d1f..80f60ce412 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VenmoForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/VenmoForm.java
@@ -83,7 +83,7 @@ public class VenmoForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
     }
 
@@ -109,7 +109,7 @@ public class VenmoForm extends PaymentMethodForm {
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
-        addLimitations();
+        addLimitations(true);
     }
 
     @Override
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java
index 8b048b8b02..296262aaa0 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java
@@ -105,7 +105,7 @@ public class WesternUnionForm extends PaymentMethodForm {
                     westernUnionAccountPayload.getState()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 westernUnionAccountPayload.getEmail());
-        addLimitations();
+        addLimitations(true);
     }
 
     private void onTradeCurrencySelected(TradeCurrency tradeCurrency) {
@@ -167,7 +167,7 @@ public class WesternUnionForm extends PaymentMethodForm {
         });
         emailInputTextField.setValidator(emailValidator);
 
-        addLimitations();
+        addLimitations(false);
         addAccountNameTextFieldWithAutoFillToggleButton();
 
         updateFromInputs();