diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/User.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/User.kt
index 8d4eecec..bc3b4581 100644
--- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/User.kt
+++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/User.kt
@@ -51,7 +51,8 @@ open class User(
     val selectedTanMediumIdentifier: String? = null,
     open val tanMedia: List<TanMedium> = listOf(),
 
-    var bankingGroup: BankingGroup? = null
+    var bankingGroup: BankingGroup? = null,
+    open var finTsServerAddress: String
 ) {
 
     var userSetDisplayName: String? = 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 8b8459e8..4f8d799a 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
@@ -128,7 +128,8 @@ open class FinTs4kMapper {
         user.selectedTanMethod?.securityFunction?.code, user.tanMethods.map { mapTanMethod(it) },
         user.selectedTanMedium?.mediumName, user.tanMedia.map { mapTanMedium(it) },
 
-        getBankingGroup(user.bankName, user.bic)
+        getBankingGroup(user.bankName, user.bic),
+        user.finTsServerAddress
     )
 
     protected open fun getBankingGroup(bankName: String, bic: String): BankingGroup? =