diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index d3fc944a70..afb2d62e0e 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -260,17 +260,21 @@ export default class SetIdServer extends React.Component {
 
         const boundThreepids = threepids.filter(tp => tp.bound);
         let message;
+        let danger = false;
         if (boundThreepids.length) {
             message = _t(
-                "You are currently sharing email addresses or phone numbers on the identity " +
-                "server <idserver />. You will need to reconnect to <idserver2 /> to stop " +
-                "sharing them.", {},
+                "You are still <b>sharing your personal data</b> on the identity " +
+                "server <idserver />. <br /> <br /> " +
+                "We recommend that you remove your email addresses and phone numbers " +
+                "from the identity server before disconnecting.", {},
                 {
                     idserver: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>,
-                    // XXX: https://github.com/vector-im/riot-web/issues/9086
-                    idserver2: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>,
+                    b: sub => <b>{sub}</b>,
+                    br: () => <br />,
                 },
             );
+            danger = true;
+            button = _t("Disconnect anyway");
         } else {
             message = unboundMessage;
         }
@@ -280,6 +284,8 @@ export default class SetIdServer extends React.Component {
             title,
             description: message,
             button,
+            cancelButton: _t("Go back"),
+            danger,
         });
         return finished;
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f31fcc7157..02fd05b067 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -563,7 +563,9 @@
     "Disconnect identity server": "Disconnect identity server",
     "Disconnect from the identity server <idserver />?": "Disconnect from the identity server <idserver />?",
     "Disconnect": "Disconnect",
-    "You are currently sharing email addresses or phone numbers on the identity server <idserver />. You will need to reconnect to <idserver2 /> to stop sharing them.": "You are currently sharing email addresses or phone numbers on the identity server <idserver />. You will need to reconnect to <idserver2 /> to stop sharing them.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />. <br /> <br /> We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "You are still <b>sharing your personal data</b> on the identity server <idserver />. <br /> <br /> We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
+    "Disconnect anyway": "Disconnect anyway",
+    "Go back": "Go back",
     "Identity Server (%(server)s)": "Identity Server (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
@@ -1287,7 +1289,6 @@
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
     "Report bugs & give feedback": "Report bugs & give feedback",
-    "Go back": "Go back",
     "Room Settings - %(roomName)s": "Room Settings - %(roomName)s",
     "Failed to upgrade room": "Failed to upgrade room",
     "The room upgrade could not be completed": "The room upgrade could not be completed",