diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
index 474a4097d1..228586e28d 100644
--- a/src/components/views/auth/CustomServerDialog.js
+++ b/src/components/views/auth/CustomServerDialog.js
@@ -27,17 +27,17 @@ module.exports = React.createClass({
                     { _t("Custom Server Options") }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span>
+                    <p>
                         { _t("You can use the custom server options to sign into other Matrix " +
-                        "servers by specifying a different Home server URL.") }
-                        <br />
+                             "servers by specifying a different homeserver URL.") }
                         { _t("This allows you to use this app with an existing Matrix account on " +
-                            "a different home server.") }
-                        <br />
-                        <br />
-                        { _t("You can also set a custom identity server but this will typically prevent " +
-                            "interaction with users based on email address.") }
-                    </span>
+                             "a different homeserver.") }
+                    </p>
+                    <p>
+                        {_t("You can also set a custom identity server, but you won't be " +
+                            "able to invite users by email address, or be invited by " +
+                            "email address yourself.")}
+                    </p>
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 40c737dc5d..e1bca55736 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1165,9 +1165,9 @@
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
     "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
     "Custom Server Options": "Custom Server Options",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "This allows you to use this app with an existing Matrix account on a different home server.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "You can also set a custom identity server but this will typically prevent interaction with users based on email address.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL.",
+    "This allows you to use this app with an existing Matrix account on a different homeserver.": "This allows you to use this app with an existing Matrix account on a different homeserver.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
     "To continue, please enter your password.": "To continue, please enter your password.",
     "Password:": "Password:",
     "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",