diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
index 5d50f2180be..5c8b7b50d2e 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
@@ -141,7 +141,7 @@ public void addFormForEditAccount() {
     @Override
     public void updateAllInputsValid() {
         allInputsValid.set(isAccountNameValid()
-                && !postalAddressTextArea.getText().isEmpty()
+                && !cashByMailAccount.getPostalAddress().isEmpty()
                 && inputValidator.validate(cashByMailAccount.getContact()).isValid
                 && paymentAccount.getSingleTradeCurrency() != null);
     }
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 4e3325f6891..4533781722d 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
@@ -60,6 +60,8 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow,
     private InputTextField holderNameInputTextField;
     private InputTextField accountNrInputTextField;
     private InputTextField sortCodeInputTextField;
+    private final BranchIdValidator branchIdValidator;
+    private final AccountNrValidator accountNrValidator;
 
     public FasterPaymentsForm(PaymentAccount paymentAccount,
                               AccountAgeWitnessService accountAgeWitnessService,
@@ -69,6 +71,8 @@ public FasterPaymentsForm(PaymentAccount paymentAccount,
                               CoinFormatter formatter) {
         super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
         this.fasterPaymentsAccount = (FasterPaymentsAccount) paymentAccount;
+        this.branchIdValidator = new BranchIdValidator("GB");
+        this.accountNrValidator = new AccountNrValidator("GB");
     }
 
     @Override
@@ -84,14 +88,14 @@ public void addFormForAddAccount() {
         // do not translate as it is used in English only
         sortCodeInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, UK_SORT_CODE);
         sortCodeInputTextField.setValidator(inputValidator);
-        sortCodeInputTextField.setValidator(new BranchIdValidator("GB"));
+        sortCodeInputTextField.setValidator(branchIdValidator);
         sortCodeInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             fasterPaymentsAccount.setSortCode(newValue);
             updateFromInputs();
         });
 
         accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.accountNr"));
-        accountNrInputTextField.setValidator(new AccountNrValidator("GB"));
+        accountNrInputTextField.setValidator(accountNrValidator);
         accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             fasterPaymentsAccount.setAccountNr(newValue);
             updateFromInputs();
@@ -134,9 +138,9 @@ public void addFormForEditAccount() {
     @Override
     public void updateAllInputsValid() {
         allInputsValid.set(isAccountNameValid()
-                && holderNameInputTextField.getValidator().validate(fasterPaymentsAccount.getHolderName()).isValid
-                && sortCodeInputTextField.getValidator().validate(fasterPaymentsAccount.getSortCode()).isValid
-                && accountNrInputTextField.getValidator().validate(fasterPaymentsAccount.getAccountNr()).isValid
+                && inputValidator.validate(fasterPaymentsAccount.getHolderName()).isValid
+                && branchIdValidator.validate(fasterPaymentsAccount.getSortCode()).isValid
+                && accountNrValidator.validate(fasterPaymentsAccount.getAccountNr()).isValid
                 && fasterPaymentsAccount.getTradeCurrencies().size() > 0);
     }
 }
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 1f17ad8f807..c888975b67f 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
@@ -118,7 +118,7 @@ public void addFormForEditAccount() {
     public void updateAllInputsValid() {
         allInputsValid.set(isAccountNameValid()
                 && usPostalMoneyOrderValidator.validate(usPostalMoneyOrderAccount.getPostalAddress()).isValid
-                && !postalAddressTextArea.getText().isEmpty()
+                && !usPostalMoneyOrderAccount.getPostalAddress().isEmpty()
                 && inputValidator.validate(usPostalMoneyOrderAccount.getHolderName()).isValid
                 && usPostalMoneyOrderAccount.getTradeCurrencies().size() > 0);
     }