diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/InMemoryBankingRepository.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/InMemoryBankingRepository.kt
index f9449b4..c6199a0 100644
--- a/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/InMemoryBankingRepository.kt
+++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/InMemoryBankingRepository.kt
@@ -49,7 +49,7 @@ class InMemoryBankingRepository(
         account.bankCode, account.loginName, account.password, account.bankName, account.bic, account.customerName, account.userId,
         // TODO: may fix someday and also add BankAccounts
         emptyList(), account.selectedTanMethodIdentifier, emptyList(), account.selectedTanMediumIdentifier, emptyList(),
-        account.bankingGroup, account.finTsServerAddress,
+        account.bankingGroup, account.serverAddress,
         account.userSetDisplayName, account.displayIndex,
         account.iconUrl, account.wrongCredentialsEntered,
     )
diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/entities/UserEntity.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/entities/UserEntity.kt
index 99376fe..a7dd175 100644
--- a/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/entities/UserEntity.kt
+++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/dataaccess/entities/UserEntity.kt
@@ -27,14 +27,14 @@ class UserEntity(
     tanMedia: List<TanMedium> = listOf(),
 
     bankingGroup: BankingGroup? = null,
-    finTsServerAddress: String,
+    serverAddress: String? = null,
 
     userSetDisplayName: String? = null,
     displayIndex: Int = 0,
 
     iconUrl: String? = null,
     wrongCredentialsEntered: Boolean = false
-) : User(bankCode, loginName, password, bankName, bic, customerName, userId, accounts, selectedTanMethodIdentifier, tanMethods, selectedTanMediumIdentifier, tanMedia, bankingGroup, finTsServerAddress) {
+) : User(bankCode, loginName, password, bankName, bic, customerName, userId, accounts, selectedTanMethodIdentifier, tanMethods, selectedTanMediumIdentifier, tanMedia, bankingGroup, serverAddress) {
 
     init {
         this.userSetDisplayName = userSetDisplayName
@@ -50,7 +50,7 @@ class UserEntity(
         user.bankCode, user.loginName, user.password, user.bankName, user.bic, user.customerName, user.userId,
         bankAccounts,
         user.selectedTanMethodIdentifier, user.tanMethods, user.selectedTanMediumIdentifier, user.tanMedia,
-        user.bankingGroup, user.finTsServerAddress,
+        user.bankingGroup, user.serverAddress,
         user.userSetDisplayName, user.displayIndex,
         user.iconUrl, user.wrongCredentialsEntered,
     )
diff --git a/composeApp/src/desktopTest/kotlin/net/codinux/banking/dataaccess/SqliteBankingRepositoryTest.kt b/composeApp/src/desktopTest/kotlin/net/codinux/banking/dataaccess/SqliteBankingRepositoryTest.kt
index 50eacea..02409f5 100644
--- a/composeApp/src/desktopTest/kotlin/net/codinux/banking/dataaccess/SqliteBankingRepositoryTest.kt
+++ b/composeApp/src/desktopTest/kotlin/net/codinux/banking/dataaccess/SqliteBankingRepositoryTest.kt
@@ -27,7 +27,7 @@ class SqliteBankingRepositoryTest {
         val bankAccounts = listOf(
             BankAccount("12345", null, null, null, "Monika Tester", BankAccountType.CheckingAccount, balance = Amount("12.34"), retrievedTransactionsFrom = LocalDate(2024, 5, 7), features = setOf(BankAccountFeatures.RetrieveBalance, BankAccountFeatures.InstantTransfer), serverTransactionsRetentionDays = 320)
         )
-        val userAccount = User("12345678", "SupiDupiUser", "geheim", "Abzock-Bank", "ABCDDEBBXXX", "Monika Tester", accounts = bankAccounts, bankingGroup = BankingGroup.DKB, finTsServerAddress = "").apply {
+        val userAccount = User("12345678", "SupiDupiUser", "geheim", "Abzock-Bank", "ABCDDEBBXXX", "Monika Tester", accounts = bankAccounts, bankingGroup = BankingGroup.DKB, serverAddress = "").apply {
             wrongCredentialsEntered = true
             displayIndex = 99
         }