diff --git a/assets/javascripts/discourse/components/ai-persona-editor.gjs b/assets/javascripts/discourse/components/ai-persona-editor.gjs
index 4810d5aa..a4222a90 100644
--- a/assets/javascripts/discourse/components/ai-persona-editor.gjs
+++ b/assets/javascripts/discourse/components/ai-persona-editor.gjs
@@ -283,25 +283,6 @@ export default class PersonaEditor extends Component {
     />
     <div class="ai-persona-editor" {{didInsert this.updateAllGroups @model.id}}>
       <Form @onSubmit={{this.save}} @data={{this.formData}} as |form data|>
-        <form.Field
-          @name="enabled"
-          @title={{i18n "discourse_ai.ai_persona.enabled"}}
-          @onSet={{fn this.toggleEnabled data}}
-          as |field|
-        >
-          <field.Toggle />
-        </form.Field>
-
-        <form.Field
-          @name="priority"
-          @title={{i18n "discourse_ai.ai_persona.priority"}}
-          @onSet={{fn this.togglePriority data}}
-          @tooltip={{i18n "discourse_ai.ai_persona.priority_help"}}
-          as |field|
-        >
-          <field.Toggle />
-        </form.Field>
-
         <form.Field
           @name="name"
           @title={{i18n "discourse_ai.ai_persona.name"}}
@@ -562,6 +543,25 @@ export default class PersonaEditor extends Component {
         {{/if}}
 
         <form.Section @title={{i18n "discourse_ai.ai_persona.ai_bot.title"}}>
+          <form.Field
+            @name="enabled"
+            @title={{i18n "discourse_ai.ai_persona.enabled"}}
+            @onSet={{fn this.toggleEnabled data}}
+            as |field|
+          >
+            <field.Toggle />
+          </form.Field>
+
+          <form.Field
+            @name="priority"
+            @title={{i18n "discourse_ai.ai_persona.priority"}}
+            @onSet={{fn this.togglePriority data}}
+            @tooltip={{i18n "discourse_ai.ai_persona.priority_help"}}
+            as |field|
+          >
+            <field.Toggle />
+          </form.Field>
+
           {{#if @model.isNew}}
             <div>{{i18n "discourse_ai.ai_persona.ai_bot.save_first"}}</div>
           {{else}}
diff --git a/assets/javascripts/discourse/components/ai-persona-list-editor.gjs b/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
index a8da1e2d..69cadec1 100644
--- a/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
+++ b/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
@@ -61,7 +61,7 @@ export default class AiPersonaListEditor extends Component {
             <thead>
               <tr>
                 <th>{{i18n "discourse_ai.ai_persona.name"}}</th>
-                <th>{{i18n "discourse_ai.ai_persona.enabled"}}</th>
+                <th>{{i18n "discourse_ai.ai_persona.list.enabled"}}</th>
                 <th></th>
               </tr>
             </thead>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a7105cc9..324f59b3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -307,9 +307,12 @@ en:
         rag_conversation_chunks_help: "The number of chunks to use for the RAG model searches. Increase to increase the amount of context the AI can use."
         persona_description: "Personas are a powerful feature that allows you to customize the behavior of the AI engine in your Discourse forum. They act as a 'system message' that guides the AI's responses and interactions, helping to create a more personalized and engaging user experience."
 
+        list:
+          enabled: "AI Bot?"
+
         ai_bot:
           title: "AI bot options"
-          save_first: "AI bot options will become available once you save the persona."
+          save_first: "More AI bot options will become available once you save the persona."
 
       rag:
         title: "RAG"