diff --git a/help/import-from-gitter.md b/help/import-from-gitter.md
index cc8b5a9ad4..fe20c3ff72 100644
--- a/help/import-from-gitter.md
+++ b/help/import-from-gitter.md
@@ -106,7 +106,7 @@ keep in mind about the import process:
 - [Gitter's export tool](https://github.com/minrk/archive-gitter) does not export
   workspace settings, so you will need to [configure the settings for your Zulip
   organization](/help/customize-organization-settings). This includes settings
-  like [email visibility](/help/restrict-visibility-of-email-addresses),
+  like [email visibility](/help/configure-email-visibility),
   [message editing permissions](/help/restrict-message-editing-and-deletion),
   and [how users can join your organization](/help/restrict-account-creation).
 
@@ -142,7 +142,7 @@ Once the import process is completed, you will need to:
 
 1. [Configure the settings for your organization](/help/customize-organization-settings),
    which are not exported. This includes settings like [email
-   visibility](/help/restrict-visibility-of-email-addresses), [message editing
+   visibility](/help/configure-email-visibility), [message editing
    permissions](/help/restrict-message-editing-and-deletion),
    and [how users can join your organization](/help/restrict-account-creation).
 
diff --git a/help/import-from-mattermost.md b/help/import-from-mattermost.md
index acc16de1a4..0c91c751a0 100644
--- a/help/import-from-mattermost.md
+++ b/help/import-from-mattermost.md
@@ -254,7 +254,7 @@ keep in mind about the import process:
 - Mattermost does not export workspace settings, so you will need to [configure
   the settings for your Zulip organization](/help/customize-organization-settings).
   This includes settings like [email
-  visibility](/help/restrict-visibility-of-email-addresses),
+  visibility](/help/configure-email-visibility),
   [message editing permissions](/help/restrict-message-editing-and-deletion),
   and [how users can join your organization](/help/restrict-account-creation).
 
diff --git a/help/import-from-rocketchat.md b/help/import-from-rocketchat.md
index c924a09649..abc6339fe9 100644
--- a/help/import-from-rocketchat.md
+++ b/help/import-from-rocketchat.md
@@ -103,7 +103,7 @@ keep in mind about the import process:
 - Rocket.Chat does not export workspace settings, so you will need to [configure
   the settings for your Zulip organization](/help/customize-organization-settings).
   This includes settings like [email
-  visibility](/help/restrict-visibility-of-email-addresses),
+  visibility](/help/configure-email-visibility),
   [message editing permissions](/help/restrict-message-editing-and-deletion),
   and [how users can join your organization](/help/restrict-account-creation).
 
diff --git a/help/import-from-slack.md b/help/import-from-slack.md
index 1c19c621c6..4022f70daa 100644
--- a/help/import-from-slack.md
+++ b/help/import-from-slack.md
@@ -134,7 +134,7 @@ in mind about the import process:
 - Slack does not export workspace settings, so you will need to [configure
   the settings for your Zulip organization](/help/customize-organization-settings).
   This includes settings like [email
-  visibility](/help/restrict-visibility-of-email-addresses),
+  visibility](/help/configure-email-visibility),
   [message editing permissions](/help/restrict-message-editing-and-deletion),
   and [how users can join your organization](/help/restrict-account-creation).
 
diff --git a/help/include/customize-organization-settings.md b/help/include/customize-organization-settings.md
index 71c308c620..7cff53f022 100644
--- a/help/include/customize-organization-settings.md
+++ b/help/include/customize-organization-settings.md
@@ -26,6 +26,6 @@ you.
 [topic-editing-permissions]: /help/restrict-moving-messages
 [default-code-block-language]: /help/code-blocks#default-code-block-language
 [code-playgrounds]: /help/code-blocks#code-playgrounds
-[email-address-visibility]: /help/restrict-visibility-of-email-addresses
+[email-address-visibility]: /help/configure-email-visibility
 [who-can-invite]: /help/restrict-account-creation#change-who-can-send-invitations
 [who-can-join]: /help/restrict-account-creation#set-whether-invitations-are-required-to-join
diff --git a/help/include/import-get-your-organization-started.md b/help/include/import-get-your-organization-started.md
index fdcc37acd6..72b9d85b15 100644
--- a/help/include/import-get-your-organization-started.md
+++ b/help/include/import-get-your-organization-started.md
@@ -4,7 +4,7 @@ Once the import process is completed, you will need to:
 
 1. [Configure the settings for your organization](/help/customize-organization-settings),
     which are not exported. This includes settings like [email
-    visibility](/help/restrict-visibility-of-email-addresses), [message editing
+    visibility](/help/configure-email-visibility), [message editing
     permissions](/help/restrict-message-editing-and-deletion),
     and [how users can join your organization](/help/restrict-account-creation).
 
diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md
index aae1cf0572..66ecbd8c48 100644
--- a/help/moderating-open-organizations.md
+++ b/help/moderating-open-organizations.md
@@ -23,7 +23,7 @@ problematic behavior:
   post](/help/stream-sending-policy).
 * Add a [waiting period](/help/restrict-permissions-of-new-members) before
   new users can take disruptive actions.
-* [Restrict visibility of email addresses](/help/restrict-visibility-of-email-addresses)
+* [Configure email visibility](/help/configure-email-visibility)
   to prevent off-platform spam.
 * [Restrict wildcard mentions](/help/restrict-wildcard-mentions)
   so only [moderators](/help/roles-and-permissions) can mention everyone in your organization.
diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md
index cc6cd3532d..7f6043b04f 100644
--- a/help/setting-up-zulip-for-a-class.md
+++ b/help/setting-up-zulip-for-a-class.md
@@ -161,7 +161,7 @@ how to assign roles and permissions for a class.
 
 - Set [who can invite new users](/help/restrict-account-creation#change-who-can-send-invitations).
   (Recommended: Admins)
-- Set [who can access user email addresses](/help/restrict-visibility-of-email-addresses).
+- Set [who can access user email addresses](/help/configure-email-visibility).
   (Recommended: Admins only)
 - Set [who can create streams](/help/configure-who-can-create-streams).
   (Recommended: Admins for public streams; Admins, moderators and members for private streams)
@@ -191,7 +191,7 @@ how to assign roles and permissions for a class.
 
 - Set [who can invite new users](/help/restrict-account-creation#change-who-can-send-invitations).
   (Recommended: Admins and moderators)
-- Set [who can access user email addresses](/help/restrict-visibility-of-email-addresses).
+- Set [who can access user email addresses](/help/configure-email-visibility).
   (Recommended: Admins only)
 - Set [who can create streams](/help/configure-who-can-create-streams).
   (Recommended: Admins and moderators for public streams;
diff --git a/help/user-cards.md b/help/user-cards.md
index 2733eaf7fd..145cd600a2 100644
--- a/help/user-cards.md
+++ b/help/user-cards.md
@@ -14,7 +14,7 @@ sent](/help/view-messages-sent-by-a-user).
 - Their avatar.
 - Their name.
 - Their email address, if you [have
-  permission](/help/restrict-visibility-of-email-addresses) to view it.
+  permission](/help/configure-email-visibility) to view it.
 - Their [role](/help/roles-and-permissions) in the organization.
 - The custom profile fields
   [selected](/help/custom-profile-fields#display-custom-fields-on-user-card) by
@@ -28,7 +28,7 @@ sent](/help/view-messages-sent-by-a-user).
 - Its name.
 - Its owner's name.
 - Its email address, if you [have
-permission](/help/restrict-visibility-of-email-addresses) to view it.
+permission](/help/configure-email-visibility) to view it.
 
 {end_tabs}
 
diff --git a/help/view-someones-profile.md b/help/view-someones-profile.md
index be9fa3db78..573233d2ef 100644
--- a/help/view-someones-profile.md
+++ b/help/view-someones-profile.md
@@ -10,7 +10,7 @@ A user's profile displays key information about the user.
 
 - Their name.
 - Their email address, if you [have
-  permission](/help/restrict-visibility-of-email-addresses) to view it.
+  permission](/help/configure-email-visibility) to view it.
 - Their user ID.
 - Their [role](/help/roles-and-permissions) in the organization.
 - The date they joined the organization.
@@ -29,7 +29,7 @@ Additional tabs showing:
 
 - Their name.
 - Their email address, if you [have
-  permission](/help/restrict-visibility-of-email-addresses) to view it.
+  permission](/help/configure-email-visibility) to view it.
 - Their current [local time](/help/change-your-timezone).
 - Their [status and availability](/help/status-and-availability).
 - Any [custom profile fields](/help/custom-profile-fields) they've filled out.
diff --git a/static/templates/settings/account_settings.hbs b/static/templates/settings/account_settings.hbs
index 41a7c835e9..b7d4b26e94 100644
--- a/static/templates/settings/account_settings.hbs
+++ b/static/templates/settings/account_settings.hbs
@@ -80,7 +80,7 @@
             </div>
             <div class="input-group">
                 <label for="email_address_visibility" class="dropdown-title">{{t "Who can access your email address" }}
-                    {{> ../help_link_widget link="/help/restrict-visibility-of-email-addresses" }}
+                    {{> ../help_link_widget link="/help/configure-email-visibility" }}
                 </label>
                 <select name="email_address_visibility" class="email_address_visibility prop-element bootstrap-focus-style" data-setting-widget-type="number"
                   id="user_email_address_visibility">
diff --git a/static/templates/settings/organization_user_settings_defaults.hbs b/static/templates/settings/organization_user_settings_defaults.hbs
index 1e8ee3d4a4..db9e548c0c 100644
--- a/static/templates/settings/organization_user_settings_defaults.hbs
+++ b/static/templates/settings/organization_user_settings_defaults.hbs
@@ -31,7 +31,7 @@
 
         <div class="input-group">
             <label for="email_address_visibility" class="dropdown-title">{{t "Who can access user's email address" }}
-                {{> ../help_link_widget link="/help/restrict-visibility-of-email-addresses" }}
+                {{> ../help_link_widget link="/help/configure-email-visibility" }}
             </label>
             <select name="email_address_visibility" class="email_address_visibility prop-element bootstrap-focus-style" data-setting-widget-type="number"
               id="realm_email_address_visibility">
diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html
index de1bcdbbf1..71c16c2cd9 100644
--- a/templates/corporate/for/education.html
+++ b/templates/corporate/for/education.html
@@ -187,7 +187,7 @@
                         </div>
                     </li>
                     <li><div class="list-content">Zulip is <a href="https://github.com/zulip">100% open source</a>. We work hard to make it <a href="https://zulip.readthedocs.io/en/latest/production/install.html">easy to set up</a> and run a self-hosted Zulip installation, where you have full control of the data.</div></li>
-                    <li><div class="list-content">Email addresses <a href="/help/restrict-visibility-of-email-addresses">can be hidden</a>, and students <a href="/help/status-and-availability#disable-updating-availability">don’t have to share</a> when they are online.</div></li>
+                    <li><div class="list-content">Email addresses <a href="/help/configure-email-visibility">can be hidden</a>, and students <a href="/help/status-and-availability#disable-updating-availability">don’t have to share</a> when they are online.</div></li>
                     <li><div class="list-content">Students can <a href="/help/mute-a-user">mute</a> anyone they'd rather not interact with.</div></li>
                 </ul>
             </div>
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 2f4a16a593..15dfa0b0bd 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -573,7 +573,7 @@ paths:
                                         due to changes in the user's
                                         [email address visibility][help-email-visibility].
 
-                                        [help-email-visibility]: /help/restrict-visibility-of-email-addresses
+                                        [help-email-visibility]: /help/configure-email-visibility
                                       properties:
                                         user_id:
                                           type: integer
@@ -9336,7 +9336,7 @@ paths:
 
         Note that this endpoint uses Zulip display emails addresses
         for organizations that have configured limited [email address
-        visibility](/help/restrict-visibility-of-email-addresses).
+        visibility](/help/configure-email-visibility).
 
         You can also fetch details on [all users in the organization](/api/get-users) or
         [by user ID](/api/get-user). Fetching by user ID is generally recommended