diff --git a/CHANGES.md b/CHANGES.md
index 5065fd74e..01f388d69 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+## Changes in 1.8.22 (2022-07-13)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.12)).
+
+🐛 Bugfixes
+
+- Fix a bug where the login screen is shown after choosing to create an account. ([#6417](https://github.com/vector-im/element-ios/pull/6417))
+
+
 ## Changes in 1.8.21 (2022-07-12)
 
 ✨ Features
diff --git a/Podfile b/Podfile
index 1ad092f27..0ef6e92ea 100644
--- a/Podfile
+++ b/Podfile
@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.11'
+$matrixSDKVersion = '= 0.23.12'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 307093f5d..59349c206 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -56,9 +56,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.11):
-    - MatrixSDK/Core (= 0.23.11)
-  - MatrixSDK/Core (0.23.11):
+  - MatrixSDK (0.23.12):
+    - MatrixSDK/Core (= 0.23.12)
+  - MatrixSDK/Core (0.23.12):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -66,9 +66,9 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.23.11):
+  - MatrixSDK/CryptoSDK (0.23.12):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.11):
+  - MatrixSDK/JingleCallStack (0.23.12):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.1.0)
@@ -123,8 +123,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.11)
-  - MatrixSDK/JingleCallStack (= 0.23.11)
+  - MatrixSDK (= 0.23.12)
+  - MatrixSDK/JingleCallStack (= 0.23.12)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 8b02aafb65c798a96c55007b1ae8e9ad4a5453e3
+  MatrixSDK: cfc3316cbe8534ff9d4d7b49a1bc92dfb6b1296d
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: ff5148bd99a1b2cacc3ba3e430afe267a74b7092
+PODFILE CHECKSUM: c5629e0a7affba9c508e7c30572ada2200ab725d
 
 COCOAPODS: 1.11.2
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
index 5add8bef2..1eb9b5d66 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKAuthenticationViewController.m
@@ -899,18 +899,21 @@
     // This is required before updating view's textfields (homeserver url...)
     [self loadViewIfNeeded];
 
-    // Force register mode
-    self.authType = MXKAuthenticationTypeLogin;
+    if (softLogoutCredentials)
+    {
+        // Force register mode
+        self.authType = MXKAuthenticationTypeLogin;
 
-    [self setHomeServerTextFieldText:softLogoutCredentials.homeServer];
-    [self setIdentityServerTextFieldText:softLogoutCredentials.identityServer];
+        [self setHomeServerTextFieldText:softLogoutCredentials.homeServer];
+        [self setIdentityServerTextFieldText:softLogoutCredentials.identityServer];
 
-    // Cancel potential request in progress
-    [mxCurrentOperation cancel];
-    mxCurrentOperation = nil;
+        // Cancel potential request in progress
+        [mxCurrentOperation cancel];
+        mxCurrentOperation = nil;
 
-    // Remove the current auth inputs view
-    self.authInputsView = nil;
+        // Remove the current auth inputs view
+        self.authInputsView = nil;
+    }
 
     // Set parameters and trigger a refresh (the parameters will be taken into account during [handleAuthenticationSession:])
     _softLogoutCredentials = softLogoutCredentials;