diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/BankAccount.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/BankAccount.kt
index d469aecf..5f1bcf1a 100644
--- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/BankAccount.kt
+++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/BankAccount.kt
@@ -16,12 +16,12 @@ open class BankAccount(
     val currency: String = "EUR",
     var accountLimit: String? = null,
 
-    val isAccountTypeSupportedByApplication: Boolean = true,
-    val features: Set<BankAccountFeatures> = emptySet(),
-
 //    var balance: BigDecimal = BigDecimal.ZERO,
     var balance: Amount = Amount.Zero, // TODO: add a BigDecimal library
 
+    val isAccountTypeSupportedByApplication: Boolean = false,
+    val features: Set<BankAccountFeatures> = emptySet(),
+
     open var lastTransactionsRetrievalTime: Instant? = null,
     var retrievedTransactionsFrom: LocalDate? = null,
 
diff --git a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt
index 92933592..1ff6e8d8 100644
--- a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt
+++ b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt
@@ -126,9 +126,9 @@ open class FinTs4kMapper {
 
     protected open fun mapAccount(account: net.dankito.banking.client.model.BankAccount) = BankAccount(
         account.identifier, account.accountHolderName, mapAccountType(account.type), account.iban, account.subAccountNumber,
-        account.productName, account.currency, account.accountLimit, account.isAccountTypeSupportedByApplication,
-        mapFeatures(account),
-        mapAmount(account.balance), account.lastTransactionsRetrievalTime, account.retrievedTransactionsFrom,
+        account.productName, account.currency, account.accountLimit, mapAmount(account.balance),
+        account.isAccountTypeSupportedByApplication, mapFeatures(account),
+        account.lastTransactionsRetrievalTime, account.retrievedTransactionsFrom,
         // TODO: map haveAllTransactionsBeenRetrieved
         countDaysForWhichTransactionsAreKept = account.countDaysForWhichTransactionsAreKept,
         bookedTransactions = mapBookedTransactions(account).toMutableList()