diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 67d390007..8691d30a2 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -1042,8 +1042,8 @@ Tap the + to start adding people.";
 // Alert explaining what an identity server / integration manager is.
 "service_terms_modal_information_title_identity_server" = "Identity Server";
 "service_terms_modal_information_title_integration_manager" = "Integration Manager";
-"service_terms_modal_information_description_identity_server" = "An identity server allows %@ to find users on Matrix by looking up their phone number or email address.";
-"service_terms_modal_information_description_integration_manager" = "An integration manager allows %@ to ...";
+"service_terms_modal_information_description_identity_server" = "An identity server helps you find your contacts, by looking up their phone number or email address, to see if they already have an account.";
+"service_terms_modal_information_description_integration_manager" = "An integration manager lets you add features from third parties.";
 
 "service_terms_modal_policy_checkbox_accessibility_hint" = "Check to accept %@";
 
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index cf7f1b935..efa5d379c 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -4051,13 +4051,13 @@ public class VectorL10n: NSObject {
   public static var serviceTermsModalFooter: String { 
     return VectorL10n.tr("Vector", "service_terms_modal_footer") 
   }
-  /// An identity server allows %@ to find users on Matrix by looking up their phone number or email address.
-  public static func serviceTermsModalInformationDescriptionIdentityServer(_ p1: String) -> String {
-    return VectorL10n.tr("Vector", "service_terms_modal_information_description_identity_server", p1)
+  /// An identity server helps you find your contacts, by looking up their phone number or email address, to see if they already have an account.
+  public static var serviceTermsModalInformationDescriptionIdentityServer: String { 
+    return VectorL10n.tr("Vector", "service_terms_modal_information_description_identity_server") 
   }
-  /// An integration manager allows %@ to ...
-  public static func serviceTermsModalInformationDescriptionIntegrationManager(_ p1: String) -> String {
-    return VectorL10n.tr("Vector", "service_terms_modal_information_description_integration_manager", p1)
+  /// An integration manager lets you add features from third parties.
+  public static var serviceTermsModalInformationDescriptionIntegrationManager: String { 
+    return VectorL10n.tr("Vector", "service_terms_modal_information_description_integration_manager") 
   }
   /// Identity Server
   public static var serviceTermsModalInformationTitleIdentityServer: String { 
diff --git a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
index ec5c271cb..a1bbb053b 100644
--- a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
+++ b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
@@ -160,16 +160,26 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     }
 
     private func setupTableView() {
-        self.tableView.delegate = self
-        self.tableView.dataSource = self
-        self.tableView.separatorStyle = .none
-        self.tableView.alwaysBounceVertical = false
-        self.tableView.backgroundColor = .clear
-        self.tableView.register(TableViewCellWithCheckBoxAndLabel.nib(), forCellReuseIdentifier: TableViewCellWithCheckBoxAndLabel.defaultReuseIdentifier())
+        guard let tableView = tableView else { return }
+        
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.separatorStyle = .none
+        tableView.alwaysBounceVertical = false
+        tableView.backgroundColor = .clear
+        tableView.register(TableViewCellWithCheckBoxAndLabel.nib(), forCellReuseIdentifier: TableViewCellWithCheckBoxAndLabel.defaultReuseIdentifier())
         
         tableHeaderView = ServiceTermsModalTableHeaderView.instantiate()
         tableHeaderView.delegate = self
-        self.tableView.tableHeaderView = tableHeaderView
+        tableView.tableHeaderView = tableHeaderView
+        
+        tableView.addConstraint(NSLayoutConstraint(item: tableView,
+                                                   attribute: .width,
+                                                   relatedBy: .equal,
+                                                   toItem: tableHeaderView,
+                                                   attribute: .width,
+                                                   multiplier: 1,
+                                                   constant: 10))
     }
 
     private func render(viewState: ServiceTermsModalScreenViewState) {
@@ -296,10 +306,10 @@ extension ServiceTermsModalScreenViewController: ServiceTermsModalTableHeaderVie
         
         if viewModel.serviceType == MXServiceTypeIdentityService {
             title = VectorL10n.serviceTermsModalInformationTitleIdentityServer
-            message = VectorL10n.serviceTermsModalInformationDescriptionIdentityServer(AppInfo.current.displayName)
+            message = VectorL10n.serviceTermsModalInformationDescriptionIdentityServer
         } else {
             title = VectorL10n.serviceTermsModalInformationTitleIntegrationManager
-            message = VectorL10n.serviceTermsModalInformationDescriptionIntegrationManager(AppInfo.current.displayName)
+            message = VectorL10n.serviceTermsModalInformationDescriptionIntegrationManager
         }
         
         let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)