diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
index 71d4e97c3b..fc114aaa6b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
-import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
@@ -63,10 +62,7 @@ class ChangeServerPresenter(
             )
             val details = authenticationService.setHomeserver(data.url).getOrThrow()
             if (details.supportsOidcLogin.not() && details.supportsPasswordLogin.not()) {
-                // Unsupported homeserver
-                throw ChangeServerError.Error(
-                    messageId = R.string.screen_login_error_unsupported_authentication,
-                )
+                throw ChangeServerError.UnsupportedServer
             }
             // Homeserver is valid, remember user choice
             accountProviderDataSource.userSelection(data)
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 8a7d015750..554c9b545e 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
@@ -8,7 +8,6 @@
 package io.element.android.features.login.impl.changeserver
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.error.ChangeServerError
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -37,9 +36,7 @@ open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerStat
             ),
             aChangeServerState(
                 changeServerAction = AsyncData.Failure(
-                    ChangeServerError.Error(
-                        R.string.screen_login_error_unsupported_authentication
-                    )
+                    ChangeServerError.UnsupportedServer
                 )
             ),
         )
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 ae2997c157..a9784580d1 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
@@ -39,6 +39,22 @@ fun ChangeServerView(
     when (state.changeServerAction) {
         is AsyncData.Failure -> {
             when (val error = state.changeServerAction.error as? ChangeServerError) {
+                ChangeServerError.InvalidServer ->
+                    ErrorDialog(
+                        modifier = modifier,
+                        content = stringResource(R.string.screen_change_server_error_invalid_homeserver),
+                        onSubmit = {
+                            eventSink.invoke(ChangeServerEvents.ClearError)
+                        }
+                    )
+                ChangeServerError.UnsupportedServer ->
+                    ErrorDialog(
+                        modifier = modifier,
+                        content = stringResource(R.string.screen_login_error_unsupported_authentication),
+                        onSubmit = {
+                            eventSink.invoke(ChangeServerEvents.ClearError)
+                        }
+                    )
                 is ChangeServerError.Error -> {
                     ErrorDialog(
                         modifier = modifier,
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 a814e61aaa..2c4550953e 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
@@ -11,7 +11,6 @@ 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.R
 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
@@ -37,6 +36,8 @@ sealed class ChangeServerError : Exception() {
     ) : ChangeServerError()
 
     data object SlidingSyncAlert : ChangeServerError()
+    data object InvalidServer : ChangeServerError()
+    data object UnsupportedServer : ChangeServerError()
 
     companion object {
         fun from(error: Throwable): ChangeServerError = when (error) {
@@ -51,7 +52,7 @@ sealed class ChangeServerError : Exception() {
                 unauthorisedAccountProviderTitle = error.unauthorisedAccountProviderTitle,
                 authorisedAccountProviderTitles = error.authorisedAccountProviderTitles,
             )
-            else -> Error(messageId = R.string.screen_change_server_error_invalid_homeserver)
+            else -> InvalidServer
         }
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
index 333347851a..4a9a7e934b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
@@ -8,14 +8,11 @@
 package io.element.android.features.login.impl.error
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.login.impl.R
 
 class ChangeServerErrorProvider : PreviewParameterProvider<ChangeServerError> {
     override val values: Sequence<ChangeServerError>
         get() = sequenceOf(
-            ChangeServerError.Error(
-                messageId = R.string.screen_change_server_error_invalid_homeserver,
-            ),
+            ChangeServerError.InvalidServer,
             ChangeServerError.Error(
                 messageStr = "An error description",
             ),
@@ -28,5 +25,6 @@ class ChangeServerErrorProvider : PreviewParameterProvider<ChangeServerError> {
                 authorisedAccountProviderTitles = listOf("provider.org", "provider.io"),
             ),
             ChangeServerError.SlidingSyncAlert,
+            ChangeServerError.UnsupportedServer,
         )
 }
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 c3fe5eac47..4c97897cce 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
@@ -41,6 +41,17 @@ fun LoginModeView(
             when (val error = loginMode.error) {
                 is ChangeServerError -> {
                     when (error) {
+                        ChangeServerError.InvalidServer ->
+                            ErrorDialog(
+                                content = stringResource(R.string.screen_change_server_error_invalid_homeserver),
+                                onSubmit = onClearError,
+                            )
+                        is ChangeServerError.UnsupportedServer -> {
+                            ErrorDialog(
+                                content = stringResource(R.string.screen_login_error_unsupported_authentication),
+                                onSubmit = onClearError,
+                            )
+                        }
                         is ChangeServerError.Error -> {
                             ErrorDialog(
                                 content = error.message(),
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
index ce026b447c..d1090cb237 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
@@ -10,7 +10,6 @@ package io.element.android.features.login.impl.changeserver
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
-import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.aMatrixHomeServerDetails
 import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.accountprovider.AccountProvider
@@ -117,7 +116,7 @@ class ChangeServerPresenterTest {
             val failureState = awaitItem()
             assertThat(failureState.changeServerAction).isInstanceOf(AsyncData.Failure::class.java)
             assertThat(failureState.changeServerAction.errorOrNull()).isEqualTo(
-                ChangeServerError.Error(R.string.screen_login_error_unsupported_authentication)
+                ChangeServerError.UnsupportedServer
             )
         }
     }