diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
index f3189b3fcf..9951dd0e6c 100644
--- a/src/components/views/settings/JoinRuleSettings.tsx
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -206,7 +206,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
         },
         {
             value: JoinRule.Public,
-            label: withRecommendLabel(_t("common|public"), JoinRule.Public),
+            label: withRecommendLabel(_t("room_settings|security|join_rule_public"), JoinRule.Public),
             description: <>{_t("room_settings|security|join_rule_public_description")}</>,
         },
     ];
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 76216c6c67..5daf0ac901 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2360,11 +2360,12 @@
             "history_visibility_warning": "Changes won't affect past messages, only new ones. <a>Learn more</a>",
             "history_visibility_world_readable": "Anyone (history is public)",
             "join_rule_description": "Decide who can join %(roomName)s.",
-            "join_rule_invite": "Private (invite only)",
+            "join_rule_invite": "Invite only",
             "join_rule_invite_description": "Only invited people can join.",
             "join_rule_knock": "Ask to join",
             "join_rule_knock_description": "People cannot join unless access is granted.",
-            "join_rule_public_description": "Anyone can find and join.",
+            "join_rule_public": "Anyone",
+            "join_rule_public_description": "Anyone can join.",
             "join_rule_restricted": "Space members",
             "join_rule_restricted_description": "Anyone in authorized spaces can join without an invitation. <a>Manage spaces</a>",
             "join_rule_restricted_description_active_space": "Anyone in <spaceName/> can join.",
@@ -2411,17 +2412,17 @@
         "upload_avatar_label": "Upload avatar",
         "visibility": {
             "alias_section": "Address",
-            "error_failed_save": "Failed to update the visibility of this space",
+            "error_failed_save": "Failed to update the settings of this space",
             "error_update_guest_access": "Failed to update the guest access of this space",
             "error_update_history_visibility": "Failed to update the history visibility of this space",
             "guest_access_disabled": "You do not have permission to change guest access.",
             "guest_access_explainer": "Guests can join a space without having an account. This may be useful for public spaces.",
             "guest_access_label": "Enable guest access",
-            "history_visibility_anyone_space": "Preview Space",
+            "history_visibility_anyone_space": "Preview space",
             "history_visibility_anyone_space_description": "Allow people to preview your space before they join.",
             "history_visibility_anyone_space_disabled": "You do not have permission to change history visibilty.",
             "history_visibility_anyone_space_recommendation": "Recommended for public spaces.",
-            "title": "Visibility"
+            "title": "Security & Privacy"
         },
         "voip": {
             "call_type_section": "Call type",