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/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 72a69d031..e1894029b 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.21
-CURRENT_PROJECT_VERSION = 1.8.21
+MARKETING_VERSION = 1.8.22
+CURRENT_PROJECT_VERSION = 1.8.22
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/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;