diff --git a/assets/javascripts/discourse/components/persona-rag-uploader.gjs b/assets/javascripts/discourse/components/persona-rag-uploader.gjs
index 66b19f2c..ce28944d 100644
--- a/assets/javascripts/discourse/components/persona-rag-uploader.gjs
+++ b/assets/javascripts/discourse/components/persona-rag-uploader.gjs
@@ -3,7 +3,6 @@ import Component, { Input } from "@ember/component";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
-import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
 import { inject as service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import { ajax } from "discourse/lib/ajax";
@@ -52,8 +51,13 @@ export default class PersonaRagUploader extends Component.extend(
     );
   }
 
-  removeListener() {
-    this.appEvents.off(`upload-mixin:${this.id}:all-uploads-complete`);
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.appEvents.off(
+      `upload-mixin:${this.id}:all-uploads-complete`,
+      this,
+      "_updatePersonaWithUploads"
+    );
   }
 
   _updatePersonaWithUploads() {
@@ -108,7 +112,7 @@ export default class PersonaRagUploader extends Component.extend(
   }
 
   <template>
-    <div class="persona-rag-uploader" {{willDestroy this.removeListener}}>
+    <div class="persona-rag-uploader">
       <h3>{{I18n.t "discourse_ai.ai_persona.uploads.title"}}</h3>
       <p>{{I18n.t "discourse_ai.ai_persona.uploads.description"}}</p>
 
diff --git a/lib/ai_bot/entry_point.rb b/lib/ai_bot/entry_point.rb
index f51b0d79..8d943c79 100644
--- a/lib/ai_bot/entry_point.rb
+++ b/lib/ai_bot/entry_point.rb
@@ -101,8 +101,8 @@ module DiscourseAi
       def inject_into(plugin)
         plugin.register_modifier(:chat_allowed_bot_user_ids) do |user_ids, guardian|
           if guardian.user
-            mentionables = AiPersona.mentionables(user: guardian.user)
-            allowed_bot_ids = mentionables.map { |mentionable| mentionable[:user_id] }
+            allowed_chat = AiPersona.allowed_chat(user: guardian.user)
+            allowed_bot_ids = allowed_chat.map { |info| info[:user_id] }
             user_ids.concat(allowed_bot_ids)
           end
           user_ids