diff --git a/web/templates/settings/organization_permissions_admin.hbs b/web/templates/settings/organization_permissions_admin.hbs
index 57dd62fc92..7ea6ac5dbe 100644
--- a/web/templates/settings/organization_permissions_admin.hbs
+++ b/web/templates/settings/organization_permissions_admin.hbs
@@ -62,38 +62,6 @@
             </div>
         </div>
 
-        <div id="org-user-identity" class="settings-subsection-parent">
-            <div class="subsection-header">
-                <h3>{{t "User identity" }}</h3>
-                {{> settings_save_discard_widget section_name="user-identity" }}
-            </div>
-            <div class="inline-block organization-permissions-parent">
-                {{> settings_checkbox
-                  setting_name="realm_name_changes_disabled"
-                  prefix="id_"
-                  is_checked=realm_name_changes_disabled
-                  label=admin_settings_label.realm_name_changes_disabled}}
-
-                {{> settings_checkbox
-                  setting_name="realm_email_changes_disabled"
-                  prefix="id_"
-                  is_checked=realm_email_changes_disabled
-                  label=admin_settings_label.realm_email_changes_disabled}}
-
-                {{> settings_checkbox
-                  setting_name="realm_avatar_changes_disabled"
-                  prefix="id_"
-                  is_checked=realm_avatar_changes_disabled
-                  label=admin_settings_label.realm_avatar_changes_disabled}}
-
-                {{> settings_checkbox
-                  setting_name="realm_enable_guest_user_indicator"
-                  prefix="id_"
-                  is_checked=realm_enable_guest_user_indicator
-                  label=admin_settings_label.realm_enable_guest_user_indicator}}
-            </div>
-        </div>
-
         <div id="org-stream-permissions" class="settings-subsection-parent">
             <div class="subsection-header">
                 <h3>{{t "Stream permissions" }}</h3>
@@ -287,6 +255,48 @@
             </div>
         </div>
 
+        <div id="org-user-identity" class="settings-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "User identity" }}</h3>
+                {{> settings_save_discard_widget section_name="user-identity" }}
+            </div>
+            <div class="inline-block organization-permissions-parent">
+                {{> settings_checkbox
+                  setting_name="realm_name_changes_disabled"
+                  prefix="id_"
+                  is_checked=realm_name_changes_disabled
+                  label=admin_settings_label.realm_name_changes_disabled}}
+
+                {{> settings_checkbox
+                  setting_name="realm_email_changes_disabled"
+                  prefix="id_"
+                  is_checked=realm_email_changes_disabled
+                  label=admin_settings_label.realm_email_changes_disabled}}
+
+                {{> settings_checkbox
+                  setting_name="realm_avatar_changes_disabled"
+                  prefix="id_"
+                  is_checked=realm_avatar_changes_disabled
+                  label=admin_settings_label.realm_avatar_changes_disabled}}
+
+            </div>
+        </div>
+
+        <div id="org-guest-settings" class="settings-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Guests" }}</h3>
+                {{> settings_save_discard_widget section_name="guest-settings" }}
+            </div>
+
+            <div class="inline-block organization-permissions-parent">
+                {{> settings_checkbox
+                  setting_name="realm_enable_guest_user_indicator"
+                  prefix="id_"
+                  is_checked=realm_enable_guest_user_indicator
+                  label=admin_settings_label.realm_enable_guest_user_indicator}}
+            </div>
+        </div>
+
         <div id="org-other-permissions" class="settings-subsection-parent">
             <div class="subsection-header">
                 <h3>{{t "Other permissions" }}</h3>