diff --git a/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt b/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
index 98590a35..c379bc4f 100644
--- a/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
+++ b/fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
@@ -485,8 +485,6 @@ open class FinTsClient @JvmOverloads constructor(
         }
 
         response.getFirstSegmentById<CommunicationInfo>(InstituteSegmentId.CommunicationInfo)?.let { communicationInfo ->
-            // TODO: set default language, also for user
-
             communicationInfo.parameters.firstOrNull { it.type == Kommunikationsdienst.Https }?.address?.let { address ->
                 bank.finTs3ServerAddress = if (address.startsWith("https://", true)) address else "https://$address"
             }
@@ -564,6 +562,12 @@ open class FinTsClient @JvmOverloads constructor(
             // TODO: may also make use of other info
         }
 
+        response.getFirstSegmentById<CommunicationInfo>(InstituteSegmentId.CommunicationInfo)?.let { communicationInfo ->
+            if (customer.selectedLanguage != communicationInfo.defaultLanguage) {
+                customer.selectedLanguage == communicationInfo.defaultLanguage
+            }
+        }
+
         val supportedJobs = response.supportedJobs
         if (supportedJobs.isNotEmpty()) { // if allowedJobsForBank is empty than bank didn't send any allowed job
             for (account in customer.accounts) {