diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
index 7c5fd6bdb2a..5bcea9b3829 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-settings-view.js
@@ -19,8 +19,8 @@ const MUTED_OPTIONS = [
 ];
 
 const AUTO_ADD_USERS_OPTIONS = [
-  { name: I18n.t("chat.settings.enable_auto_join_users"), value: true },
-  { name: I18n.t("chat.settings.disable_auto_join_users"), value: false },
+  { name: I18n.t("yes_value"), value: true },
+  { name: I18n.t("no_value"), value: false },
 ];
 
 export default class ChatChannelSettingsView extends Component {
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index c07d07d2faa..0bfd12f57c0 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -291,8 +291,7 @@ en:
       settings:
         auto_join_users_label: "Automatically add users"
         auto_join_users_info: "Check hourly which users have been active in the last 3 months and, if they have access to the %{category} category, add them to this channel."
-        enable_auto_join_users: "Yes"
-        disable_auto_join_users: "No"
+        enable_auto_join_users: "Automatically add all recently active users"
         auto_join_users_warning: "Every user who isn't a member of this channel and has access to the %{category} category will join. Are you sure?"
         desktop_notification_level: "Desktop notifications"
         follow: "Join"