diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt
index bb447615fc..e4901ed3ab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticationService.kt
@@ -157,10 +157,12 @@ internal class DefaultAuthenticationService @Inject constructor(@Unauthenticated
             // Keep only the home sever config
             pendingSessionData?.homeServerConnectionConfig
                     ?.let {
-                        pendingSessionStore.savePendingSessionData(PendingSessionData(it))
+                        pendingSessionData = PendingSessionData(it)
+                                .also { data -> pendingSessionStore.savePendingSessionData(data) }
                     }
                     ?: run {
                         // Should not happen
+                        pendingSessionData = null
                         pendingSessionStore.delete()
                     }
         }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt
index f02e64c620..b847773682 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/login/DefaultLoginWizard.kt
@@ -92,17 +92,15 @@ internal class DefaultLoginWizard(
                 pendingSessionData.sendAttempt
         )
 
-        pendingSessionData = pendingSessionData.copy(
-                sendAttempt = pendingSessionData.sendAttempt + 1
-        ).also { pendingSessionStore.savePendingSessionData(it) }
+        pendingSessionData = pendingSessionData.copy(sendAttempt = pendingSessionData.sendAttempt + 1)
+                .also { pendingSessionStore.savePendingSessionData(it) }
 
         val result = executeRequest<AddThreePidRegistrationResponse> {
             apiCall = authAPI.resetPassword(AddThreePidRegistrationParams.from(param))
         }
 
-        pendingSessionData = pendingSessionData.copy(
-                resetPasswordData = ResetPasswordData(newPassword, result)
-        ).also { pendingSessionStore.savePendingSessionData(it) }
+        pendingSessionData = pendingSessionData.copy(resetPasswordData = ResetPasswordData(newPassword, result))
+                .also { pendingSessionStore.savePendingSessionData(it) }
     }
 
     override fun resetPasswordMailConfirmed(callback: MatrixCallback<Unit>): Cancelable {