diff --git a/help/configure-email-visibility.md b/help/configure-email-visibility.md
new file mode 100644
index 0000000000..f16f10ae0d
--- /dev/null
+++ b/help/configure-email-visibility.md
@@ -0,0 +1,33 @@
+# Configure email visibility
+
+With privacy in mind, Zulip lets you control which
+[roles](/help/roles-and-permissions) in the organization can view your email
+address. Administrators can set the default email visibility configuration
+for new users in the organization.
+
+## Configure who can access your email address
+
+{start_tabs}
+
+{settings_tab|account-and-privacy}
+
+1. Under **Privacy**, configure **Who can access your email address**.
+
+{end_tabs}
+
+## Configure default email visibility for new users
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{settings_tab|default-user-settings}
+
+1. Under **Privacy settings**, configure **Who can access user's email address**.
+
+{end_tabs}
+
+## Related articles
+
+* [Moderating open organizations](/help/moderating-open-organizations)
+* [Restrict name and email changes](/help/restrict-name-and-email-changes)
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index 485ed75bf4..dce51c228d 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -37,6 +37,7 @@
 * [Change your email address](/help/change-your-email-address)
 * [Change your profile picture](/help/change-your-profile-picture)
 * [Change your password](/help/change-your-password)
+* [Configure email visibility](/help/configure-email-visibility)
 * [Logging in](/help/logging-in)
 * [Logging out](/help/logging-out)
 * [Switching between organizations](/help/switching-between-organizations)
@@ -162,7 +163,6 @@
 * [Configure default new user settings](/help/configure-default-new-user-settings)
 * [Configure organization language](/help/configure-organization-language)
 * [User groups](/help/user-groups)
-* [Restrict visibility of email addresses](/help/restrict-visibility-of-email-addresses)
 * [Change a user's role](/help/change-a-users-role)
 * [Change a user's name](/help/change-a-users-name)
 * [Manage a user's stream subscriptions](/help/manage-user-stream-subscriptions)
diff --git a/help/restrict-visibility-of-email-addresses.md b/help/restrict-visibility-of-email-addresses.md
deleted file mode 100644
index 46ffa21f64..0000000000
--- a/help/restrict-visibility-of-email-addresses.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Restrict visibility of email addresses
-
-{!admin-only.md!}
-
-By default, any user can find and view the email address of any other
-user.  Organization administrators can restrict access so that only
-admins (or nobody) can view other users' email addresses.
-
-### Restrict visibility of email addresses
-
-{start_tabs}
-
-{settings_tab|organization-permissions}
-
-2. Under **User identity**, configure **Who can access user email addresses**.
-
-{!save-changes.md!}
-
-{end_tabs}
-
-## Caveats
-
-There are a few places in the app where Zulip shows fake email addresses (like
-`Ada Starr <user1234@example.zulipchat.com>`) rather than just `Ada Starr`. This might
-cause some confusion for users. The fake email addresses do not work, and
-email sent to those addresses will bounce.
-
-## Related articles
-
-* [Moderating open organizations](/help/moderating-open-organizations)
diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py
index 2a96c51459..26cbb5404b 100644
--- a/zerver/lib/url_redirects.py
+++ b/zerver/lib/url_redirects.py
@@ -26,6 +26,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
         "/help/configure-message-editing-and-deletion",
         "/help/restrict-message-editing-and-deletion",
     ),
+    URLRedirect("/help/restrict-visibility-of-email-addresses", "/help/configure-email-visibility"),
     URLRedirect("/help/change-default-view", "/help/configure-default-view"),
     URLRedirect("/help/recent-topics", "/help/recent-conversations"),
     URLRedirect(