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 44bb919466..848db9f606 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
@@ -396,11 +396,6 @@ abstract class BankForm extends GeneralBankForm {
         });
     }
 
-    @Override
-    protected void autoFillNameTextField() {
-        autoFillAccountTextFields(bankAccountPayload);
-    }
-
     @Override
     public void updateAllInputsValid() {
         boolean result = isAccountNameValid()
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 ab645b5342..ab319063de 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
@@ -31,6 +31,7 @@ import bisq.core.locale.Res;
 import bisq.core.locale.TradeCurrency;
 import bisq.core.payment.CountryBasedPaymentAccount;
 import bisq.core.payment.PaymentAccount;
+import bisq.core.payment.payload.BankAccountPayload;
 import bisq.core.payment.payload.CashDepositAccountPayload;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.util.coin.CoinFormatter;
@@ -444,11 +445,6 @@ public class CashDepositForm extends GeneralBankForm {
         });
     }
 
-    @Override
-    protected void autoFillNameTextField() {
-        autoFillAccountTextFields(cashDepositAccountPayload);
-    }
-
     @Override
     public void updateAllInputsValid() {
         boolean result = isAccountNameValid()
@@ -483,4 +479,24 @@ public class CashDepositForm extends GeneralBankForm {
                     cashDepositAccountPayload.getHolderName());
         }
     }
+
+    @Override
+    protected String getBankId() {
+        return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBankId();
+    }
+
+    @Override
+    protected String getBranchId() {
+        return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBranchId();
+    }
+
+    @Override
+    protected String getBankName() {
+        return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getBankName();
+    }
+
+    @Override
+    protected String getAccountNr() {
+        return ((CashDepositAccountPayload) paymentAccount.paymentAccountPayload).getAccountNr();
+    }
 }
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java
index 6461ee9c83..dfb843bff8 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java
@@ -137,62 +137,28 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
         }
     }
 
-    void autoFillAccountTextFields(CountryBasedPaymentAccountPayload paymentAccountPayload) {
-
-
-        BankAccountPayload bankAccountPayload = null;
-        CashDepositAccountPayload cashDepositAccountPayload = null;
-        if (paymentAccountPayload instanceof BankAccountPayload) {
-            bankAccountPayload = (BankAccountPayload) paymentAccountPayload;
-        } else if (paymentAccountPayload instanceof CashDepositAccountPayload) {
-            cashDepositAccountPayload = (CashDepositAccountPayload) paymentAccountPayload;
-        }
-
+    @Override
+    protected void autoFillNameTextField() {
         if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) {
             String bankId = null;
-            String countryCode = paymentAccountPayload.getCountryCode();
+            String countryCode = getCountryCode();
             if (countryCode == null)
                 countryCode = "";
             if (BankUtil.isBankIdRequired(countryCode)) {
-                if (bankAccountPayload != null) {
-                    bankId = bankAccountPayload.getBankId();
-                } else if (cashDepositAccountPayload != null) {
-                    bankId = cashDepositAccountPayload.getBankId();
-                } else {
-                    bankId = bankIdInputTextField.getText().trim();
-                }
+                bankId = getBankId();
                 if (bankId.length() > 9)
                     bankId = StringUtils.abbreviate(bankId, 9);
             } else if (BankUtil.isBranchIdRequired(countryCode)) {
-                if (bankAccountPayload != null) {
-                    bankId = bankAccountPayload.getBranchId();
-                } else if (cashDepositAccountPayload != null) {
-                    bankId = cashDepositAccountPayload.getBranchId();
-                } else {
-                    bankId = branchIdInputTextField.getText().trim();
-                }
+                bankId = getBranchId();
                 if (bankId.length() > 9)
                     bankId = StringUtils.abbreviate(bankId, 9);
             } else if (BankUtil.isBankNameRequired(countryCode)) {
-                if (bankAccountPayload != null) {
-                    bankId = bankAccountPayload.getBankName();
-                } else if (cashDepositAccountPayload != null) {
-                    bankId = cashDepositAccountPayload.getBankName();
-                } else {
-                    bankId = bankNameInputTextField.getText().trim();
-                }
+                bankId = getBankName();
                 if (bankId.length() > 9)
                     bankId = StringUtils.abbreviate(bankId, 9);
             }
 
-            String accountNr;
-            if (bankAccountPayload != null) {
-                accountNr = bankAccountPayload.getAccountNr();
-            } else if (cashDepositAccountPayload != null) {
-                accountNr = cashDepositAccountPayload.getAccountNr();
-            } else {
-                accountNr = accountNrInputTextField.getText().trim();
-            }
+            String accountNr = getAccountNr();
             if (accountNr.length() > 9)
                 accountNr = StringUtils.abbreviate(accountNr, 9);
 
@@ -243,4 +209,24 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
 
         return result;
     }
+
+    protected String getBankId() {
+        return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBankId();
+    }
+
+    protected String getBranchId() {
+        return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBranchId();
+    }
+
+    protected String getBankName() {
+        return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getBankName();
+    }
+
+    protected String getAccountNr() {
+        return ((BankAccountPayload) paymentAccount.paymentAccountPayload).getAccountNr();
+    }
+
+    protected String getCountryCode() {
+        return ((CountryBasedPaymentAccountPayload) paymentAccount.paymentAccountPayload).getCountryCode();
+    }
 }
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
index 9c0841036b..cc2d6fedde 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
@@ -30,7 +30,6 @@ import bisq.core.locale.TradeCurrency;
 import bisq.core.payment.CountryBasedPaymentAccount;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.payment.payload.BankAccountPayload;
-import bisq.core.payment.payload.CountryBasedPaymentAccountPayload;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.util.coin.CoinFormatter;
 import bisq.core.util.validation.InputValidator;
@@ -162,9 +161,4 @@ public abstract class GeneralUsBankForm extends GeneralBankForm {
             paymentAccount.setSingleTradeCurrency(currency);
         }
     }
-
-    @Override
-    protected void autoFillNameTextField() {
-        autoFillAccountTextFields((BankAccountPayload) paymentAccount.getPaymentAccountPayload());
-    }
 }