diff --git a/templates/zerver/help/restrict-name-and-email-changes.md b/templates/zerver/help/restrict-name-and-email-changes.md
index b970f6bcd2..0eed746e4d 100644
--- a/templates/zerver/help/restrict-name-and-email-changes.md
+++ b/templates/zerver/help/restrict-name-and-email-changes.md
@@ -2,39 +2,53 @@
 
 {!admin-only.md!}
 
-## Prevent users from changing their name
+## Restrict name changes
 
-By default, any user can [change their name](/help/change-your-name). You
-can instead prevent users from changing their name. Organization
-administrators can always [change anyone's name](/help/change-a-users-name).
+By default, any user can [change their name](/help/change-your-name).
+You can instead prevent users from changing their name. This setting is
+especially useful if user names are managed via an external source, and
+synced into Zulip via the [Zulip API](/api), [LDAP][ldap-sync-data] or
+another method.
 
-This setting is especially useful if user names are managed via an external
-source, and synced into Zulip via the [Zulip API](/api) or another method.
+!!! tip ""
+
+    Organization administrators can always [change anyone's
+    name](/help/change-a-users-name).
 
 {start_tabs}
 
 {settings_tab|organization-permissions}
 
-2. Under the **User identity**, select **Prevent users from changing their name**.
+1. Under **User identity**, select **Prevent users from changing their
+   name**.
 
 {!save-changes.md!}
 
 {end_tabs}
 
-## Prevent all email changes
+## Restrict email changes
 
-By default, any user can
-[change their email address](/help/change-your-email-address). However, you
-can instead prevent all email changes. This is especially useful for
-organizations that are using LDAP or another single
-sign-on solution to manage user emails.
+By default, any user can [change their email address][change-email].
+However, you can instead prevent users from changing their email
+address. This setting is especially useful for organizations that
+are using [LDAP][ldap-sync-data] or another single sign-on solution
+to manage user emails.
+
+!!! tip ""
+
+    Organization administrators can always change their own email
+    address.
 
 {start_tabs}
 
 {settings_tab|organization-permissions}
 
-2. Under **User identity**, select **Prevent users from changing their email address**.
+1. Under **User identity**, select **Prevent users from changing their
+   email address**.
 
 {!save-changes.md!}
 
 {end_tabs}
+
+[change-email]: /help/change-your-email-address
+[ldap-sync-data]: https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#synchronizing-data
diff --git a/templates/zerver/help/restrict-profile-picture-changes.md b/templates/zerver/help/restrict-profile-picture-changes.md
index 53ac2913dc..6dc6e10906 100644
--- a/templates/zerver/help/restrict-profile-picture-changes.md
+++ b/templates/zerver/help/restrict-profile-picture-changes.md
@@ -2,20 +2,26 @@
 
 {!admin-only.md!}
 
-By default, any user can [change their profile
-picture](/help/change-your-profile-picture).  You can instead prevent
-users from changing their profile picture (primarily useful in
-organizations that are [synchronizing profile pictures from
-LDAP][ldap-sync]) or a similar directory.
+By default, any user can [change their profile picture][change-avatar].
+You can instead prevent users from changing their profile picture. This
+setting is primarily useful in organizations that are [synchronizing
+profile pictures from LDAP][ldap-sync-avatars] or a similar directory.
 
-[ldap-sync-avatars]: https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#synchronizing-avatars
+!!! tip ""
+
+    Organization administrators can always change their own profile
+    picture.
 
 {start_tabs}
 
 {settings_tab|organization-permissions}
 
-2. Under the **User identity**, select **Prevent users from changing their avatar**.
+1. Under **User identity**, select **Prevent users from changing their
+   avatar**.
 
 {!save-changes.md!}
 
 {end_tabs}
+
+[change-avatar]: /help/change-your-profile-picture
+[ldap-sync-avatars]: https://zulip.readthedocs.io/en/latest/production/authentication-methods.html#synchronizing-avatars