diff --git a/Nio/Generated/Strings.swift b/Nio/Generated/Strings.swift
index 673a5b3c..921dcc15 100644
--- a/Nio/Generated/Strings.swift
+++ b/Nio/Generated/Strings.swift
@@ -312,8 +312,10 @@ internal enum L10n {
     internal static let data = L10n.tr("Localizable", "settings-identity-server.data")
     /// Data & Privacy
     internal static let dataPrivacy = L10n.tr("Localizable", "settings-identity-server.data-privacy")
-    /// By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (@example.nio.chat).
-    internal static let dataText = L10n.tr("Localizable", "settings-identity-server.data-text")
+    /// By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (%@).
+    internal static func dataText(_ p1: Any) -> String {
+      return L10n.tr("Localizable", "settings-identity-server.data-text", String(describing: p1))
+    }
     /// Learn More
     internal static let learnMore = L10n.tr("Localizable", "settings-identity-server.learn-more")
     /// Match
@@ -322,7 +324,7 @@ internal enum L10n {
     internal static let matchText = L10n.tr("Localizable", "settings-identity-server.match-text")
     /// (Optional) Contact Sync
     internal static let optionalContactSync = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync")
-    /// When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared by Nio.
+    /// When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared with other parties by Nio.
     internal static let optionalContactSyncText = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync-text")
     /// Please go to Settings and turn on the permissions.
     internal static let permissionAlertBody = L10n.tr("Localizable", "settings-identity-server.permission-alert-body")
diff --git a/Nio/NewConversation/NewConversationView.swift b/Nio/NewConversation/NewConversationView.swift
index b45425b2..d860e59d 100644
--- a/Nio/NewConversation/NewConversationView.swift
+++ b/Nio/NewConversation/NewConversationView.swift
@@ -41,7 +41,7 @@ struct NewConversationView: View {
     let store: AccountStore?
 
     @State private var users = [""]
-    @State private var usersVerified: [UserStatus] = [UserStatus.unkown]
+    @State private var usersVerified: [UserStatus] = [UserStatus.unknown]
     @State private var numCalls: Int = 0
 
     @State private var isRetrieving = false
@@ -233,7 +233,7 @@ struct NewConversationView: View {
 
     private func addUser() {
         withAnimation {
-            usersVerified.append(UserStatus.unkown)
+            usersVerified.append(UserStatus.unknown)
             users.append("")
         }
     }
diff --git a/Nio/Settings/IdentityServerSettings.swift b/Nio/Settings/IdentityServerSettings.swift
index ed9d6ee5..c9ce7feb 100644
--- a/Nio/Settings/IdentityServerSettings.swift
+++ b/Nio/Settings/IdentityServerSettings.swift
@@ -61,10 +61,12 @@ struct InformationDetailView: View {
                     .font(.headline)
                     .foregroundColor(.primary)
                     .accessibility(addTraits: .isHeader)
+                    .textCase(.none)
 
                 Text(subTitle)
                     .foregroundColor(.secondary)
                     .fixedSize(horizontal: false, vertical: true)
+                    .textCase(.none)
             }
         }
         .padding(.top)
@@ -72,11 +74,13 @@ struct InformationDetailView: View {
 }
 
 struct InformationContainerView: View {
+    @EnvironmentObject private var store: AccountStore
+
     var body: some View {
         VStack(alignment: .leading) {
             InformationDetailView(
                 title: L10n.SettingsIdentityServer.data,
-                subTitle: L10n.SettingsIdentityServer.dataText,
+                subTitle: L10n.SettingsIdentityServer.dataText(store.session?.myUserId ?? "@username:server.org"),
                 imageName: "arrow.up.doc"
             )
 
diff --git a/Nio/Supporting Files/en.lproj/Localizable.strings b/Nio/Supporting Files/en.lproj/Localizable.strings
index 61ec01be..974a73f8 100644
--- a/Nio/Supporting Files/en.lproj/Localizable.strings	
+++ b/Nio/Supporting Files/en.lproj/Localizable.strings	
@@ -90,13 +90,13 @@
 "settings-identity-server.learn-more" = "Learn More";
 "settings-identity-server.data-privacy" = "Data & Privacy";
 "settings-identity-server.data" = "Data";
-"settings-identity-server.data-text" = "By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (@example.nio.chat).";
+"settings-identity-server.data-text" = "By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (%@).";
 "settings-identity-server.match" = "Match";
 "settings-identity-server.match-text" = "Any user can retrieve your Matrix ID by entering your email address or phone number, but cannot find your email address or phone number by entering your Matrix ID.";
 "settings-identity-server.closed-federation" = "Closed Federation";
 "settings-identity-server.closed-federation-text" = "At the moment, the identity servers are in a closed federation configuration. This means that there are only two identity servers (matrix.org, vector.im) and all data uploaded to one is copied to the other.";
 "settings-identity-server.optional-contact-sync" = "(Optional) Contact Sync";
-"settings-identity-server.optional-contact-sync-text" = "When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared by Nio.";
+"settings-identity-server.optional-contact-sync-text" = "When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared with other parties by Nio.";
 "new-conversation.title-chat" = "New Chat";
 "new-conversation.title-room" = "New Room";
 "new-conversation.username-placeholder" = "Matrix ID";