diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings
index 8c89e6ab2..7a28e9977 100644
--- a/Session/Meta/Translations/de.lproj/Localizable.strings
+++ b/Session/Meta/Translations/de.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings
index c2cfd575d..a44ec41ba 100644
--- a/Session/Meta/Translations/en.lproj/Localizable.strings
+++ b/Session/Meta/Translations/en.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your\nrecovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings
index c43511fbb..cae2e1ba5 100644
--- a/Session/Meta/Translations/es.lproj/Localizable.strings
+++ b/Session/Meta/Translations/es.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings
index d57306657..09deab863 100644
--- a/Session/Meta/Translations/fa.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fa.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings
index fe4bb5765..94f286050 100644
--- a/Session/Meta/Translations/fi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fi.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings
index 4f2c97f16..28d7361a6 100644
--- a/Session/Meta/Translations/fr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fr.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings
index 9f041760b..df4852ab5 100644
--- a/Session/Meta/Translations/hi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hi.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings
index 2221280e4..061e61827 100644
--- a/Session/Meta/Translations/hr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hr.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings
index 7de933f5e..a92c316ba 100644
--- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings
+++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings
index b400b542d..e4f77fb83 100644
--- a/Session/Meta/Translations/it.lproj/Localizable.strings
+++ b/Session/Meta/Translations/it.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings
index 308c35b31..b5d91bc73 100644
--- a/Session/Meta/Translations/ja.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ja.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings
index c0d17a963..e771530de 100644
--- a/Session/Meta/Translations/nl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/nl.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings
index 61ec7dc35..cf81ca9d6 100644
--- a/Session/Meta/Translations/pl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pl.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
index 419057be9..482cef21b 100644
--- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings
index ca20dd6b6..d3b8ec6da 100644
--- a/Session/Meta/Translations/ru.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ru.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings
index 15ddc2f21..b9d5dbd4a 100644
--- a/Session/Meta/Translations/si.lproj/Localizable.strings
+++ b/Session/Meta/Translations/si.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings
index 829d27ba4..c8dcc438b 100644
--- a/Session/Meta/Translations/sk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sk.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings
index b1c2a8853..89db9b794 100644
--- a/Session/Meta/Translations/sv.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sv.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings
index 494a1efff..bd813f517 100644
--- a/Session/Meta/Translations/th.lproj/Localizable.strings
+++ b/Session/Meta/Translations/th.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
index 0a425b5bb..87d515e00 100644
--- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
index 049a55e6f..8a8b52243 100644
--- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
index e8c4f03e2..e5a2e0ced 100644
--- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
@@ -666,6 +666,8 @@
 "privacy_policy" = "Privacy Policy";
 "onboarding_display_name_explanation" = "It can be your real name, an alias, or anything else you like — and you can change it any time.";
 "onboarding_display_name_hint" = "Enter your display name";
+"onboarding_display_name_title_new" = "Pick a new display name";
+"onboarding_display_name_explanation_new" = "We were unable to load your display name. Please enter a new display name to continue.";
 "onboarding_recovery_password_title" = "Save your recovery password";
 "onboarding_recovery_password_explanation" = "Use your password to load your account on new devices. Make sure it is stored in a safe place — and don't share it with anyone.";
 "tap_to_copy" = "Tap to copy";
diff --git a/Session/Onboarding/DisplayNameView.swift b/Session/Onboarding/DisplayNameView.swift
index 49b757714..420d805cc 100644
--- a/Session/Onboarding/DisplayNameView.swift
+++ b/Session/Onboarding/DisplayNameView.swift
@@ -32,12 +32,14 @@ struct DisplayNameView: View {
                 ) {
                     Spacer()
                     
-                    Text("vc_display_name_title_2".localized())
+                    let title: String = (self.flow == .register) ? "vc_display_name_title_2".localized() : "onboarding_display_name_title_new".localized()
+                    Text(title)
                         .bold()
                         .font(.system(size: Values.veryLargeFontSize))
                         .foregroundColor(themeColor: .textPrimary)
                     
-                    Text("onboarding_display_name_explanation".localized())
+                    let explanation: String = (self.flow == .register) ? "onboarding_display_name_explanation".localized() : "onboarding_display_name_explanation_new".localized()
+                    Text(explanation)
                         .font(.system(size: Values.smallFontSize))
                         .foregroundColor(themeColor: .textPrimary)
                         .padding(.vertical, Values.mediumSpacing)
diff --git a/Session/Onboarding/LoadingView.swift b/Session/Onboarding/LoadingView.swift
index 485c921f6..0d71e3505 100644
--- a/Session/Onboarding/LoadingView.swift
+++ b/Session/Onboarding/LoadingView.swift
@@ -62,10 +62,18 @@ struct LoadingView: View {
         ) { timer in
             self.percentage += 0.01
             if percentage >= 1 {
+                self.percentage = 1
                 timer.invalidate()
+                finishLoading()
             }
         }
     }
+    
+    private func finishLoading() {
+        let viewController: SessionHostingViewController = SessionHostingViewController(rootView: DisplayNameView(flow: flow))
+        viewController.setUpNavBarSessionIcon()
+        self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
+    }
 }
 
 struct CircularProgressView: View {