diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 72da28230e..792c74e019 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -759,7 +759,7 @@ class LoginViewModel @AssistedInject constructor(
                 )
             }
 
-            try {
+            val data = try {
                 authenticationService.getLoginFlow(homeServerConnectionConfig)
             } catch (failure: Throwable) {
                 _viewEvents.post(LoginViewEvents.Failure(failure))
@@ -772,39 +772,36 @@ class LoginViewModel @AssistedInject constructor(
                 }
                 null
             }
-                    ?.let { data ->
-                        // Valid Homeserver, add it to the history.
-                        // Note: we add what the user has input, data.homeServerUrl can be different
-                        rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
 
-                        when (data) {
-                            is LoginFlowResult.Success -> {
-                                val loginMode = when {
-                                    // SSO login is taken first
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
-                                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
-                                    else                                                                  -> LoginMode.Unsupported
-                                }
+            if (data is LoginFlowResult.Success) {
+                // Valid Homeserver, add it to the history.
+                // Note: we add what the user has input, data.homeServerUrl can be different
+                rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
 
-                                // FIXME We should post a view event here normally?
-                                setState {
-                                    copy(
-                                            asyncHomeServerLoginFlowRequest = Uninitialized,
-                                            homeServerUrl = data.homeServerUrl,
-                                            loginMode = loginMode,
-                                            loginModeSupportedTypes = data.supportedLoginTypes.toList()
-                                    )
-                                }
-                                if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported)
-                                        || data.isOutdatedHomeserver) {
-                                    // Notify the UI
-                                    _viewEvents.post(LoginViewEvents.OutdatedHomeserver)
-                                }
-                            }
-                        }
-                    }
+                val loginMode = when {
+                    // SSO login is taken first
+                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
+                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
+                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
+                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
+                    else                                                                  -> LoginMode.Unsupported
+                }
+
+                // FIXME We should post a view event here normally?
+                setState {
+                    copy(
+                            asyncHomeServerLoginFlowRequest = Uninitialized,
+                            homeServerUrl = data.homeServerUrl,
+                            loginMode = loginMode,
+                            loginModeSupportedTypes = data.supportedLoginTypes.toList()
+                    )
+                }
+                if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported)
+                        || data.isOutdatedHomeserver) {
+                    // Notify the UI
+                    _viewEvents.post(LoginViewEvents.OutdatedHomeserver)
+                }
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index ab8fb292da..2c0b78a546 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -89,7 +89,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
                 )
             }
 
-            try {
+            val data = try {
                 authenticationService.getLoginFlowOfSession(session.sessionId)
             } catch (failure: Throwable) {
                 setState {
@@ -99,26 +99,23 @@ class SoftLogoutViewModel @AssistedInject constructor(
                 }
                 null
             }
-                    ?.let { data ->
-                        when (data) {
-                            is LoginFlowResult.Success -> {
-                                val loginMode = when {
-                                    // SSO login is taken first
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
-                                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
-                                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
-                                    else                                                                  -> LoginMode.Unsupported
-                                }
 
-                                setState {
-                                    copy(
-                                            asyncHomeServerLoginFlowRequest = Success(loginMode)
-                                    )
-                                }
-                            }
-                        }
-                    }
+            if (data is LoginFlowResult.Success) {
+                val loginMode = when {
+                    // SSO login is taken first
+                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
+                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
+                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
+                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
+                    else                                                                  -> LoginMode.Unsupported
+                }
+
+                setState {
+                    copy(
+                            asyncHomeServerLoginFlowRequest = Success(loginMode)
+                    )
+                }
+            }
         }
     }