diff --git a/help/hide-message-content-in-emails.md b/help/hide-message-content-in-emails.md
index dd543a5169..1c7682782e 100644
--- a/help/hide-message-content-in-emails.md
+++ b/help/hide-message-content-in-emails.md
@@ -15,7 +15,7 @@ being sent through the email system.
 
 {settings_tab|organization-settings}
 
-1. Under **Other settings**, toggle
+1. Under **Automated messages and emails**, toggle
    **Allow message content in message notification emails**.
 
 {end_tabs}
diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbs
index 42a74a58f6..ad8c84656a 100644
--- a/web/templates/settings/organization_settings_admin.hbs
+++ b/web/templates/settings/organization_settings_admin.hbs
@@ -30,6 +30,12 @@
                   label=admin_settings_label.realm_signup_notifications_stream
                   value_type="number" }}
 
+                {{> settings_checkbox
+                  setting_name="realm_message_content_allowed_in_email_notifications"
+                  prefix="id_"
+                  is_checked=realm_message_content_allowed_in_email_notifications
+                  label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
+
                 {{> settings_checkbox
                   setting_name="realm_send_welcome_emails"
                   prefix="id_"
@@ -132,12 +138,6 @@
                   label=admin_settings_label.realm_default_code_block_language
                   value_type="string" }}
 
-                {{> settings_checkbox
-                  setting_name="realm_message_content_allowed_in_email_notifications"
-                  prefix="id_"
-                  is_checked=realm_message_content_allowed_in_email_notifications
-                  label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
-
                 {{> settings_checkbox
                   setting_name="realm_mandatory_topics"
                   prefix="id_"