diff --git a/frontend/src/components/CommentBox.vue b/frontend/src/components/CommentBox.vue
index 3fcfc82c..86074750 100644
--- a/frontend/src/components/CommentBox.vue
+++ b/frontend/src/components/CommentBox.vue
@@ -149,7 +149,7 @@ function removeAttachment(attachment) {
 
 const users = computed(() => {
   return (
-    usersList.data
+    usersList.data?.crmUsers
       ?.filter((user) => user.enabled)
       .map((user) => ({
         label: user.full_name.trimEnd(),
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 612e67a2..c81fa5f3 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -60,7 +60,7 @@ import {
   showSettings,
   activeSettingsPage,
 } from '@/composables/settings'
-import { Dialog, Button, Avatar } from 'frappe-ui'
+import { Dialog, Avatar } from 'frappe-ui'
 import { ref, markRaw, computed, watch, h } from 'vue'
 
 const { isManager, isAgent, getUser } = usersStore()