diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
index 446d6611d0..2626e56365 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
@@ -85,12 +85,11 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
         suspend {
             val domain = tryOrNull { URL(homeserverUrl) }?.host ?: homeserverUrl
             authenticationService.setHomeserver(domain).map {
-                authenticationService.getHomeserverDetails().value!!
-            }.map {
-                if (it.supportsOidcLogin) {
+                val matrixHomeServerDetails = authenticationService.getHomeserverDetails().value!!
+                if (matrixHomeServerDetails.supportsOidcLogin) {
                     // Retrieve the details right now
                     LoginFlow.OidcFlow(authenticationService.getOidcUrl().getOrThrow())
-                } else if (it.supportsPasswordLogin) {
+                } else if (matrixHomeServerDetails.supportsPasswordLogin) {
                     LoginFlow.PasswordLogin
                 } else {
                     throw IllegalStateException("Unsupported login flow")