diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
index 554c9b545e..020d5a0851 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
@@ -10,13 +10,12 @@ package io.element.android.features.login.impl.changeserver
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.login.impl.error.ChangeServerError
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.ui.strings.CommonStrings
 
 open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerState> {
     override val values: Sequence<ChangeServerState>
         get() = sequenceOf(
             aChangeServerState(),
-            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.Error(CommonStrings.error_unknown))),
+            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.Error(null))),
             aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.SlidingSyncAlert)),
             aChangeServerState(
                 changeServerAction = AsyncData.Failure(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
index a9784580d1..bf13250f7f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
@@ -26,6 +26,7 @@ import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.LocalBuildMeta
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun ChangeServerView(
@@ -58,7 +59,7 @@ fun ChangeServerView(
                 is ChangeServerError.Error -> {
                     ErrorDialog(
                         modifier = modifier,
-                        content = error.message(),
+                        content = error.messageStr ?: stringResource(CommonStrings.error_unknown),
                         onSubmit = {
                             eventSink.invoke(ChangeServerEvents.ClearError)
                         }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
index 2c4550953e..cd5dcf95b3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
@@ -7,23 +7,13 @@
 
 package io.element.android.features.login.impl.error
 
-import androidx.annotation.StringRes
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.res.stringResource
 import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
-import io.element.android.libraries.ui.strings.CommonStrings
 
 sealed class ChangeServerError : Exception() {
     data class Error(
-        @StringRes val messageId: Int? = null,
         val messageStr: String? = null,
-    ) : ChangeServerError() {
-        @Composable
-        @ReadOnlyComposable
-        fun message(): String = messageStr ?: stringResource(messageId ?: CommonStrings.error_unknown)
-    }
+    ) : ChangeServerError()
 
     data class NeedElementPro(
         val unauthorisedAccountProviderTitle: String,
@@ -52,7 +42,7 @@ sealed class ChangeServerError : Exception() {
                 unauthorisedAccountProviderTitle = error.unauthorisedAccountProviderTitle,
                 authorisedAccountProviderTitles = error.authorisedAccountProviderTitles,
             )
-            else -> InvalidServer
+            else -> Error(messageStr = error.message)
         }
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
index 4c97897cce..1c5d1f929a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
@@ -54,7 +54,7 @@ fun LoginModeView(
                         }
                         is ChangeServerError.Error -> {
                             ErrorDialog(
-                                content = error.message(),
+                                content = error.messageStr ?: stringResource(CommonStrings.error_unknown),
                                 onSubmit = onClearError,
                             )
                         }
@@ -102,7 +102,7 @@ fun LoginModeView(
                 }
                 is AuthenticationException.AccountAlreadyLoggedIn -> {
                     ErrorDialog(
-                        content = stringResource(CommonStrings.error_account_already_logged_in, error.message.orEmpty()),
+                        content = stringResource(CommonStrings.error_account_already_logged_in, error.userId),
                         onSubmit = onClearError,
                     )
                 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
index 03e8d57150..7370135729 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
@@ -7,10 +7,13 @@
 
 package io.element.android.libraries.matrix.api.auth
 
-sealed class AuthenticationException(message: String) : Exception(message) {
-    class AccountAlreadyLoggedIn(userId: String) : AuthenticationException(userId)
-    class InvalidServerName(message: String) : AuthenticationException(message)
-    class SlidingSyncVersion(message: String) : AuthenticationException(message)
-    class Oidc(message: String) : AuthenticationException(message)
-    class Generic(message: String) : AuthenticationException(message)
+sealed class AuthenticationException(message: String?) : Exception(message) {
+    data class AccountAlreadyLoggedIn(
+        val userId: String,
+    ) : AuthenticationException(null)
+
+    class InvalidServerName(message: String?) : AuthenticationException(message)
+    class SlidingSyncVersion(message: String?) : AuthenticationException(message)
+    class Oidc(message: String?) : AuthenticationException(message)
+    class Generic(message: String?) : AuthenticationException(message)
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
index 05eb4c4d5f..1960fe7c60 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
@@ -12,7 +12,6 @@ import org.matrix.rustcomponents.sdk.ClientBuildException
 import org.matrix.rustcomponents.sdk.OidcException
 
 fun Throwable.mapAuthenticationException(): AuthenticationException {
-    val message = this.message ?: "Unknown error"
     return when (this) {
         is AuthenticationException -> this
         is ClientBuildException -> when (this) {