diff --git a/assets/javascripts/discourse/components/chatbot-user-preferences.gjs b/assets/javascripts/discourse/components/chatbot-user-preferences.gjs
new file mode 100644
index 00000000..7a6e3a55
--- /dev/null
+++ b/assets/javascripts/discourse/components/chatbot-user-preferences.gjs
@@ -0,0 +1,10 @@
+import PreferenceCheckbox from "discourse/components/preference-checkbox";
+import { i18n } from "discourse-i18n";
+
+<template>
+  <label class="control-label">{{i18n "chatbot.user_prefs.title"}}</label>
+  <PreferenceCheckbox
+    @labelKey="chatbot.user_prefs.prefer_no_quickchat_pm_popup"
+    @checked={{@model.custom_fields.chatbot_user_prefs_disable_quickchat_pm_composer_popup_mobile}}
+  />
+</template>
diff --git a/assets/javascripts/discourse/connectors/user-custom-preferences/chatbot-user-preferences.hbs b/assets/javascripts/discourse/connectors/user-custom-preferences/chatbot-user-preferences.hbs
index 3e237798..1d4a1b53 100755
--- a/assets/javascripts/discourse/connectors/user-custom-preferences/chatbot-user-preferences.hbs
+++ b/assets/javascripts/discourse/connectors/user-custom-preferences/chatbot-user-preferences.hbs
@@ -1,3 +1,3 @@
-{{#if siteSettings.chatbot_enabled}}
+{{#if this.siteSettings.chatbot_enabled}}
   <ChatbotUserPreferences @model={{this.model}} />
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/chatbot-user-preferences.hbs b/assets/javascripts/discourse/templates/components/chatbot-user-preferences.hbs
deleted file mode 100644
index 9633216b..00000000
--- a/assets/javascripts/discourse/templates/components/chatbot-user-preferences.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<label class="control-label">{{i18n "chatbot.user_prefs.title"}}</label>
-<PreferenceCheckbox
-  @labelKey="chatbot.user_prefs.prefer_no_quickchat_pm_popup"
-  @checked={{this.model.custom_fields.chatbot_user_prefs_disable_quickchat_pm_composer_popup_mobile}}
-/>
\ No newline at end of file
diff --git a/plugin.rb b/plugin.rb
index 66cf9b57..c60c22ab 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-chatbot
 # about: a plugin that allows you to have a conversation with a configurable chatbot in Chat, Topics and Private Messages
-# version: 1.5.15
+# version: 1.5.16
 # authors: merefield
 # url: https://github.com/merefield/discourse-chatbot