diff --git a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccount.kt b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccount.kt
index 66d390de..a133fc87 100644
--- a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccount.kt
+++ b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccount.kt
@@ -14,7 +14,7 @@ open class BankAccount @JvmOverloads constructor(
     var subAccountNumber: String?,
     var balance: BigDecimal = BigDecimal.ZERO,
     var currency: String = "EUR",
-    var type: BankAccountType = BankAccountType.Giro,
+    var type: BankAccountType = BankAccountType.Girokonto,
     var supportsRetrievingAccountTransactions: Boolean = false,
     var supportsRetrievingBalance: Boolean = false,
     var supportsTransferringMoney: Boolean = false,
diff --git a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccountType.kt b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccountType.kt
index d383a600..963cffc1 100644
--- a/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccountType.kt
+++ b/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/BankAccountType.kt
@@ -3,6 +3,24 @@ package net.dankito.banking.ui.model
 
 enum class BankAccountType {
 
-    Giro
+    Girokonto,
+
+    Sparkonto,
+
+    Festgeldkonto,
+
+    Wertpapierdepot,
+
+    Darlehenskonto,
+
+    Kreditkartenkonto,
+
+    FondsDepot,
+
+    Bausparvertrag,
+
+    Versicherungsvertrag,
+
+    Sonstige
 
 }
\ No newline at end of file
diff --git a/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt b/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
index f8a5c863..510190e4 100644
--- a/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
+++ b/fints4javaBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
@@ -90,8 +90,16 @@ open class fints4javaModelMapper {
 
     open fun mapBankAccountType(type: AccountType?): BankAccountType {
         return when (type) {
-
-            else -> BankAccountType.Giro
+            AccountType.Girokonto -> BankAccountType.Girokonto
+            AccountType.Sparkonto -> BankAccountType.Sparkonto
+            AccountType.Festgeldkonto -> BankAccountType.Festgeldkonto
+            AccountType.Wertpapierdepot -> BankAccountType.Wertpapierdepot
+            AccountType.Darlehenskonto -> BankAccountType.Darlehenskonto
+            AccountType.Kreditkartenkonto -> BankAccountType.Kreditkartenkonto
+            AccountType.FondsDepot -> BankAccountType.FondsDepot
+            AccountType.Bausparvertrag -> BankAccountType.Bausparvertrag
+            AccountType.Versicherungsvertrag -> BankAccountType.Versicherungsvertrag
+            else -> BankAccountType.Sonstige
         }
     }