diff --git a/ui/BankingJavaFxApp/src/main/resources/Messages.properties b/ui/BankingJavaFxApp/src/main/resources/Messages.properties
index 3ffcbe0f..516bd3fa 100755
--- a/ui/BankingJavaFxApp/src/main/resources/Messages.properties
+++ b/ui/BankingJavaFxApp/src/main/resources/Messages.properties
@@ -40,6 +40,7 @@ add.account.dialog.customer.id=Customer Id (Account number)
 add.account.dialog.customer.id.hint=The user name you use for logging in into online banking
 add.account.dialog.password=Online banking password
 add.account.dialog.password.hint=The password you use for logging in into online banking
+add.account.dialog.error.bank.does.not.support.fints.3.error.message=%s does not support FinTS 3.0 and therefore cannot be used in this application.
 add.account.dialog.error.could.not.add.account=Could not add account for bank code '%s' and customer id '%s'.\r\n\r\nError message from your bank:\r\n\r\n%s
 add.account.dialog.successfully.added.account=Successfully added account.\r\n\r\nWould you like to fetch all account transactions now? If so entering a TAN is required.
 add.account.dialog.successfully.added.account.bank.supports.retrieving.transactions.of.last.90.days.without.tan=Successfully added account.\r\n\r\nYour bank supports retrieving account transactions of last 90 days without TAN. These are already displayed in background.\r\n\r\nWould you like to fetch all account transactions now? If so entering a TAN is required.
diff --git a/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties b/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
index e7b4dc45..111317f8 100755
--- a/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
+++ b/ui/BankingJavaFxApp/src/main/resources/Messages_de.properties
@@ -40,6 +40,7 @@ add.account.dialog.customer.id=Kundennummer (Kontonummer)
 add.account.dialog.customer.id.hint=Der Nutzernamen den Sie fürs Online Banking verwenden
 add.account.dialog.password=Online Banking Passwort
 add.account.dialog.password.hint=Das Passwort das Sie fürs Online Banking verwenden
+add.account.dialog.error.bank.does.not.support.fints.3.error.message=%s untersützt FinTS 3.0 nicht und kann deshalb mit dieser App nicht verwendet werden.
 add.account.dialog.error.could.not.add.account=Konnte Konto für Bankleitzahl '%s' und Nutzername '%s' nicht hinzufügen.\r\n\r\nFehlermeldung Ihrer Bank:\r\n\r\n%s
 add.account.dialog.successfully.added.account=Hinzufügen des Kontos war erfolgreich.\r\n\r\nMöchten Sie nun die Kontoumsätze abholfen? Falls ja muss eine TAN eingegeben werden.
 add.account.dialog.successfully.added.account.bank.supports.retrieving.transactions.of.last.90.days.without.tan=Hinzufügen des Kontos war erfolgreich.\r\n\r\nIhre Bank unterstützt das Abholen der Kontoumätze der letzten 90 Tage ohne TAN. Diese werden im Hintergrund bereits angezeigt.\r\n\r\nMöchten Sie nun alle Kontoumsätze abholfen? Falls ja muss eine TAN eingegeben werden.
diff --git a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/AddAccountDialog.kt b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/AddAccountDialog.kt
index b0260d2e..4e3295fe 100755
--- a/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/AddAccountDialog.kt
+++ b/ui/BankingJavaFxControls/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/AddAccountDialog.kt
@@ -88,9 +88,6 @@ open class AddAccountDialog(protected val presenter: BankingPresenter) : Window(
             prefHeight = TextFieldHeight
 
             textProperty().addListener { _, _, newValue -> searchBanks(newValue) }
-//            focusedProperty().addListener { _, _, newValue ->
-//                if(newValue) searchBanks(text)
-//            }
 
             onAutoCompletion = { bankSelected(it) }
             listCellFragment = BankInfoListCellFragment::class
@@ -221,7 +218,7 @@ open class AddAccountDialog(protected val presenter: BankingPresenter) : Window(
         checkIfRequiredDataHasBeenEntered()
 
         if (bank.supportsFinTs3_0 == false) {
-//            showBankDoesNotSupportFinTs30ErrorMessage(bank) // TODO
+            showBankDoesNotSupportFinTs30ErrorMessage(bank)
         }
     }
 
@@ -229,6 +226,12 @@ open class AddAccountDialog(protected val presenter: BankingPresenter) : Window(
         txtfldBankCode.impl_traverse(Direction.NEXT)
     }
 
+    protected open fun showBankDoesNotSupportFinTs30ErrorMessage(bank: BankInfo) {
+        val errorMessage = String.format(messages["add.account.dialog.error.bank.does.not.support.fints.3.error.message"], bank.name)
+
+        JavaFxDialogService().showErrorMessageOnUiThread(errorMessage)
+    }
+
 
     protected open fun checkIsEnteredBankCodeValid(enteredBankCode: String?) {
         enteredBankCode?.let {