diff --git a/desk/src/components/TextEditor.vue b/desk/src/components/TextEditor.vue
index 7e3c8a162..9b5d1b7fd 100644
--- a/desk/src/components/TextEditor.vue
+++ b/desk/src/components/TextEditor.vue
@@ -11,7 +11,12 @@
       <template #top>
         <span class="text-base">
           <span class="flex items-center justify-between">
-            <UserAvatar :user="authStore.userId" expand strong />
+            <UserAvatar
+              :name="authStore.userName"
+              :image="authStore.userImage"
+              expand
+              strong
+            />
             <slot name="top-right" />
           </span>
           <slot name="top-bottom" />
diff --git a/desk/src/components/TimelineItem.vue b/desk/src/components/TimelineItem.vue
index 6b24ebbdd..e2263221c 100644
--- a/desk/src/components/TimelineItem.vue
+++ b/desk/src/components/TimelineItem.vue
@@ -2,7 +2,7 @@
   <span>
     <LucideDot class="absolute -left-3 h-6 w-6 bg-white text-gray-500" />
     <div class="mb-1 font-medium text-gray-900 first-letter:capitalize">
-      {{ user?.full_name || user }} {{ action }}
+      {{ user.name }} {{ action }}
     </div>
     <Tooltip :text="dayjs(date).long()">
       <div class="text-gray-700 first-letter:capitalize">
@@ -15,17 +15,13 @@
 <script setup lang="ts">
 import { Tooltip } from "frappe-ui";
 import { dayjs } from "@/dayjs";
-import { useUserStore } from "@/stores/user";
+import { UserInfo } from "@/types";
 
 interface P {
-  user: string;
+  user: UserInfo;
   date: string;
   action?: string;
 }
 
-const props = withDefaults(defineProps<P>(), {
-  action: "",
-});
-const userStore = useUserStore();
-const user = userStore.getUser(props.user);
+defineProps<P>();
 </script>
diff --git a/desk/src/components/UserAvatar.vue b/desk/src/components/UserAvatar.vue
index b06863210..d896fe6ba 100644
--- a/desk/src/components/UserAvatar.vue
+++ b/desk/src/components/UserAvatar.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="flex items-center gap-2">
-    <Avatar
-      :label="user?.full_name || props.user"
-      :image="image || user?.user_image"
-      v-bind="$attrs"
-    />
+    <Avatar :label="name" :image="image" v-bind="$attrs" />
     <span
       v-if="expand"
       class="truncate"
@@ -13,28 +9,23 @@
         'font-medium': strong,
       }"
     >
-      {{ user?.full_name || props.user }}
+      {{ name }}
     </span>
   </div>
 </template>
 <script setup lang="ts">
-import { computed } from "vue";
 import { Avatar } from "frappe-ui";
-import { useUserStore } from "@/stores/user";
 
 interface P {
-  user?: string;
+  name: string;
   image?: string;
   expand?: boolean;
   strong?: boolean;
 }
 
-const props = withDefaults(defineProps<P>(), {
-  user: "",
+withDefaults(defineProps<P>(), {
   image: "",
   expand: false,
   strong: false,
 });
-const { getUser } = useUserStore();
-const user = computed(() => getUser(props.user));
 </script>
diff --git a/desk/src/components/notifications/Notifications.vue b/desk/src/components/notifications/Notifications.vue
index 60b487cb9..ad03666f7 100644
--- a/desk/src/components/notifications/Notifications.vue
+++ b/desk/src/components/notifications/Notifications.vue
@@ -43,7 +43,7 @@
         :to="getRoute(n)"
         @click="() => notificationStore.toggle()"
       >
-        <UserAvatar :user="n.user_from" />
+        <UserAvatar v-bind="n.user_from" />
         <span>
           <div class="mb-2 leading-5">
             <component :is="getBody(n)" v-bind="n" />
diff --git a/desk/src/components/notifications/NotificationsMention.vue b/desk/src/components/notifications/NotificationsMention.vue
index 9a9d7d909..17bdf3687 100644
--- a/desk/src/components/notifications/NotificationsMention.vue
+++ b/desk/src/components/notifications/NotificationsMention.vue
@@ -1,20 +1,18 @@
 <template>
   <span class="space-x-1 text-gray-700">
-    <span class="font-medium text-gray-900">{{ user.full_name || user }}</span>
+    <span class="font-medium text-gray-900">{{ user_from.name }}</span>
     <span>mentioned you in ticket</span>
-    <span class="font-medium text-gray-900">{{ props.reference_ticket }}</span>
+    <span class="font-medium text-gray-900">{{ reference_ticket }}</span>
   </span>
 </template>
 
 <script setup lang="ts">
-import { useUserStore } from "@/stores/user";
+import { UserInfo } from "@/types";
 
 interface P {
-  user_from: string;
+  user_from: UserInfo;
   reference_ticket: string;
 }
 
-const props = defineProps<P>();
-const { getUser } = useUserStore();
-const user = getUser(props.user_from);
+defineProps<P>();
 </script>
diff --git a/desk/src/pages/c-layout/CLayoutNav.vue b/desk/src/pages/c-layout/CLayoutNav.vue
index c1178d78c..7edc9d323 100644
--- a/desk/src/pages/c-layout/CLayoutNav.vue
+++ b/desk/src/pages/c-layout/CLayoutNav.vue
@@ -5,7 +5,12 @@
     <Dropdown :options="options">
       <template #default="{ open }">
         <div class="flex cursor-pointer items-center gap-1">
-          <UserAvatar :user="authStore.userId" expand strong />
+          <UserAvatar
+            :name="authStore.userName"
+            :image="authStore.userImage"
+            expand
+            strong
+          />
           <div class="text-gray-700">
             <Icon v-if="open" icon="lucide:chevron-up" />
             <Icon v-else icon="lucide:chevron-down" />
diff --git a/desk/src/pages/ticket/TicketAgentActions.vue b/desk/src/pages/ticket/TicketAgentActions.vue
index d02a9efec..25c37632d 100644
--- a/desk/src/pages/ticket/TicketAgentActions.vue
+++ b/desk/src/pages/ticket/TicketAgentActions.vue
@@ -3,10 +3,10 @@
     <Autocomplete
       :options="agentStore.dropdown"
       :value="
-        assignedTo
+        data.assignee
           ? {
-              label: assignedTo?.full_name,
-              value: assignedTo?.name,
+              label: data.assignee.name,
+              value: data.assignee.email,
             }
           : null
       "
@@ -15,18 +15,11 @@
     >
       <template #prefix>
         <Avatar
-          v-if="assignedTo"
+          v-if="data.assignee"
           class="mr-2"
           size="sm"
-          :label="assignedTo?.full_name"
-          :image="assignedTo?.user_image"
-        />
-      </template>
-      <template #item-prefix="{ option }">
-        <Avatar
-          class="mr-2"
-          :label="userStore.getUser(option.value)?.full_name"
-          :image="userStore.getUser(option.value)?.user_image"
+          :label="data.assignee.name"
+          :image="data.assignee.image"
         />
       </template>
     </Autocomplete>
@@ -95,21 +88,13 @@ import { emitter } from "@/emitter";
 import { createToast } from "@/utils";
 import { useAgentStore } from "@/stores/agent";
 import { useTicketStatusStore } from "@/stores/ticketStatus";
-import { useUserStore } from "@/stores/user";
 import { useError } from "@/composables/error";
 import { ITicket } from "./symbols";
 
 const ticket = inject(ITicket);
 const agentStore = useAgentStore();
 const ticketStatusStore = useTicketStatusStore();
-const userStore = useUserStore();
 const data = computed(() => ticket.data);
-const assignedTo = computed(() => {
-  const assignJson = JSON.parse(data.value._assign);
-  const arr = Array.isArray(assignJson) ? assignJson : [];
-  const user = arr.slice(-1).pop();
-  return userStore.getUser(user);
-});
 
 function assignAgent(agent: string) {
   createResource({
diff --git a/desk/src/pages/ticket/TicketComment.vue b/desk/src/pages/ticket/TicketComment.vue
index cbe908d56..2349d4fd9 100644
--- a/desk/src/pages/ticket/TicketComment.vue
+++ b/desk/src/pages/ticket/TicketComment.vue
@@ -2,7 +2,7 @@
   <div class="my-4 rounded border bg-cyan-50 p-4">
     <div class="mb-4 flex items-center justify-between">
       <div class="flex items-center gap-0.5 text-base">
-        <UserAvatar :user="sender" size="lg" expand strong />
+        <UserAvatar v-bind="user" size="lg" expand strong />
         <Icon icon="lucide:dot" class="text-gray-500" />
         <Tooltip :text="dayjs(date).long()">
           <div class="text-gray-600">
@@ -36,8 +36,9 @@ import { createResource, Badge, Button, Dropdown, Tooltip } from "frappe-ui";
 import { Icon } from "@iconify/vue";
 import { dayjs } from "@/dayjs";
 import { emitter } from "@/emitter";
-import { useAuthStore } from "@/stores/auth";
 import { createToast } from "@/utils";
+import { useAuthStore } from "@/stores/auth";
+import { UserInfo } from "@/types";
 import { UserAvatar } from "@/components";
 
 interface P {
@@ -45,11 +46,11 @@ interface P {
   date: string;
   isPinned: number;
   name: string;
-  sender: string;
+  user: UserInfo;
 }
 
 const props = defineProps<P>();
-const { content, name, sender, isPinned } = toRefs(props);
+const { content, name, isPinned, user } = toRefs(props);
 const authStore = useAuthStore();
 const IconTrash = h(Icon, { icon: "lucide:trash-2" });
 const IconPin = h(Icon, { icon: "lucide:pin" });
@@ -65,7 +66,7 @@ const options = computed(() =>
       label: "Delete",
       icon: IconTrash,
       onClick: () => deleteComment.submit(),
-      isHidden: sender.value !== authStore.userId,
+      isHidden: user.value.email !== authStore.userId,
     },
   ].filter((i) => !i.isHidden)
 );
diff --git a/desk/src/pages/ticket/TicketCommunication.vue b/desk/src/pages/ticket/TicketCommunication.vue
index 29e18dca2..43f4d3d12 100644
--- a/desk/src/pages/ticket/TicketCommunication.vue
+++ b/desk/src/pages/ticket/TicketCommunication.vue
@@ -2,7 +2,7 @@
   <div class="mx-3 pt-6">
     <div class="mb-4 flex items-center justify-between text-base">
       <div class="flex items-center gap-0.5">
-        <UserAvatar :user="sender" size="lg" expand strong />
+        <UserAvatar v-bind="user" size="lg" expand strong />
         <Icon icon="lucide:dot" class="text-gray-500" />
         <Tooltip :text="dayjs(date).long()">
           <div class="text-gray-600">
@@ -30,6 +30,7 @@ import { Tooltip } from "frappe-ui";
 import sanitizeHtml from "sanitize-html";
 import { Icon } from "@iconify/vue";
 import { dayjs } from "@/dayjs";
+import { UserInfo } from "@/types";
 import { AttachmentItem, UserAvatar } from "@/components";
 
 interface Attachment {
@@ -40,7 +41,7 @@ interface Attachment {
 interface P {
   content: string;
   date: string;
-  sender: string;
+  user: UserInfo;
   cc?: string;
   bcc?: string;
   attachments?: Attachment[];
diff --git a/desk/src/pages/ticket/TicketConversation.vue b/desk/src/pages/ticket/TicketConversation.vue
index f3d1972a2..7992f1c76 100644
--- a/desk/src/pages/ticket/TicketConversation.vue
+++ b/desk/src/pages/ticket/TicketConversation.vue
@@ -6,14 +6,14 @@
         :name="c.name"
         :content="c.content"
         :date="c.creation"
-        :sender="c.commented_by"
+        :user="c.user"
         :is-pinned="c.is_pinned"
       />
       <TicketCommunication
         v-else
         :content="c.content"
         :date="c.creation"
-        :sender="c.sender"
+        :user="c.user"
         :sender-image="c.sender"
         :cc="c.cc || ''"
         :bcc="c.bcc || ''"
diff --git a/desk/src/pages/ticket/TicketHistory.vue b/desk/src/pages/ticket/TicketHistory.vue
index 29a5ee94d..992b3e651 100644
--- a/desk/src/pages/ticket/TicketHistory.vue
+++ b/desk/src/pages/ticket/TicketHistory.vue
@@ -9,7 +9,7 @@
           class="mb-4 ml-4"
         >
           <TimelineItem
-            :user="event.owner"
+            :user="event.user"
             :date="event.creation"
             :action="event.action"
           />
diff --git a/desk/src/pages/ticket/TicketTextEditor.vue b/desk/src/pages/ticket/TicketTextEditor.vue
index 65d8365fd..826519410 100644
--- a/desk/src/pages/ticket/TicketTextEditor.vue
+++ b/desk/src/pages/ticket/TicketTextEditor.vue
@@ -32,6 +32,11 @@
       <span class="flex">
         <slot name="bottom-left" />
         <FileUploader
+          :upload-args="{
+            doctype: 'HD Ticket',
+            folder: 'Home/Helpdesk',
+            private: true,
+          }"
           @success="(f: File) => $emit('update:attachments', [...attachments, f])"
         >
           <template #default="{ openFileSelector }">
@@ -59,7 +64,11 @@
     class="flex w-full cursor-pointer items-center gap-2 rounded bg-gray-100 px-3.5 py-2 hover:bg-gray-200"
     @click="() => $emit('update:expand', !expand)"
   >
-    <UserAvatar :user="authStore.userId" size="sm" />
+    <UserAvatar
+      :name="authStore.userName"
+      :image="authStore.userImage"
+      size="sm"
+    />
     <span class="text-base text-gray-700">
       {{ placeholder }}
     </span>
diff --git a/desk/src/pages/ticket/TicketViews.vue b/desk/src/pages/ticket/TicketViews.vue
index 105e5df46..bdc1a3895 100644
--- a/desk/src/pages/ticket/TicketViews.vue
+++ b/desk/src/pages/ticket/TicketViews.vue
@@ -8,7 +8,7 @@
           :key="event.name"
           class="mb-4 ml-4"
         >
-          <TimelineItem :user="event.viewed_by" :date="event.creation" />
+          <TimelineItem :user="event.user" :date="event.creation" />
         </li>
       </ol>
     </div>
diff --git a/desk/src/pages/tickets/TicketsAgent.vue b/desk/src/pages/tickets/TicketsAgent.vue
index e7597e902..214544372 100644
--- a/desk/src/pages/tickets/TicketsAgent.vue
+++ b/desk/src/pages/tickets/TicketsAgent.vue
@@ -160,7 +160,7 @@ const columns = [
   },
   {
     label: "Assignee",
-    key: "_assign",
+    key: "assignee",
     width: "w-40",
   },
   {
diff --git a/desk/src/pages/tickets/TicketsAgentList.vue b/desk/src/pages/tickets/TicketsAgentList.vue
index 3b6dad4c3..3d59ecc14 100644
--- a/desk/src/pages/tickets/TicketsAgentList.vue
+++ b/desk/src/pages/tickets/TicketsAgentList.vue
@@ -29,8 +29,8 @@
         </span>
       </span>
     </template>
-    <template #_assign="{ data }">
-      <UserAvatar :user="getAssign(data._assign)" expand />
+    <template #assignee="{ data }">
+      <UserAvatar v-bind="data.assignee" expand />
     </template>
     <template #agreement_status="{ data }">
       <Badge
diff --git a/desk/src/router/index.js b/desk/src/router/index.js
index b480294b7..7c98773d5 100644
--- a/desk/src/router/index.js
+++ b/desk/src/router/index.js
@@ -1,6 +1,5 @@
 import { createRouter, createWebHistory } from "vue-router";
 import { useAuthStore } from "@/stores/auth";
-import { useUserStore } from "@/stores/user";
 import { init as initTelemetry } from "@/telemetry";
 import { AuthPages } from "./auth";
 import { CustomerPages } from "./customer";
@@ -232,7 +231,6 @@ export const router = createRouter({
 router.beforeEach(async (to) => {
   const isAuthRoute = AUTH_ROUTES.includes(to.name);
   const authStore = useAuthStore();
-  useUserStore();
 
   try {
     await initTelemetry();
diff --git a/desk/src/stores/notification.ts b/desk/src/stores/notification.ts
index 53d82f59a..36ccee4ad 100644
--- a/desk/src/stores/notification.ts
+++ b/desk/src/stores/notification.ts
@@ -1,14 +1,15 @@
 import { computed, ref } from "vue";
 import { defineStore } from "pinia";
-import { createResource, createListResource } from "frappe-ui";
+import { createResource } from "frappe-ui";
 import { useAuthStore } from "@/stores/auth";
 import { useError } from "@/composables/error";
+import { createListManager } from "@/composables/listManager";
 import { Notification, Resource } from "@/types";
 
 export const useNotificationStore = defineStore("notification", () => {
   const authStore = useAuthStore();
   const visible = ref(false);
-  const resource: Resource<Array<Notification>> = createListResource({
+  const resource: Resource<Array<Notification>> = createListManager({
     doctype: "HD Notification",
     cache: "Notifications",
     filters: {
@@ -24,9 +25,8 @@ export const useNotificationStore = defineStore("notification", () => {
       "user_from",
       "user_to",
     ],
-    orded_by: "creation desc",
+    orderBy: "creation desc",
     auto: true,
-    debounce: 500,
   });
   const clear = createResource({
     url: "helpdesk.helpdesk.doctype.hd_notification.utils.clear",
diff --git a/desk/src/stores/user.ts b/desk/src/stores/user.ts
deleted file mode 100644
index c0428c59c..000000000
--- a/desk/src/stores/user.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { defineStore } from "pinia";
-import { createResource } from "frappe-ui";
-import { keyBy } from "lodash";
-
-type User = {
-  email: string;
-  full_name: string;
-  name: string;
-  user_image: string;
-  username: string;
-};
-
-export const useUserStore = defineStore("user", () => {
-  const d__ = createResource({
-    url: "helpdesk.api.user.get_all",
-    cache: "Users",
-    auto: true,
-    transform(data) {
-      return keyBy(data, (u) => u.name);
-    },
-  });
-
-  function getUser(user: string) {
-    const data = d__.data;
-    return (data ? data[user] : {}) as User;
-  }
-
-  return {
-    getUser,
-  };
-});
diff --git a/desk/src/types.ts b/desk/src/types.ts
index c6ea5c214..e10adfb83 100644
--- a/desk/src/types.ts
+++ b/desk/src/types.ts
@@ -68,6 +68,7 @@ export interface TicketFeedback {
 
 export interface Ticket {
   _assign: string;
+  assignee: UserInfo;
   agent_group: string;
   customer: string;
   modified: string;
@@ -149,6 +150,12 @@ export type Notification = {
   read: boolean;
   reference_comment: string;
   reference_ticket: string;
-  user_from: string;
-  user_to: string;
+  user_from: UserInfo;
+  user_to: UserInfo;
+};
+
+export type UserInfo = {
+  email: string;
+  image: string;
+  name: string;
 };
diff --git a/helpdesk/extends/client.py b/helpdesk/extends/client.py
index a347d0be9..4fa40406b 100644
--- a/helpdesk/extends/client.py
+++ b/helpdesk/extends/client.py
@@ -7,6 +7,7 @@
 import frappe
 from frappe.model.base_document import get_controller
 from frappe.query_builder.functions import Count
+from frappe.utils import get_user_info_for_avatar
 
 from helpdesk.utils import check_permissions
 
@@ -43,7 +44,10 @@ def get_list(
 	if not fields:
 		query = apply_custom_select(doctype, query)
 
-	return query.run(as_dict=True, debug=debug)
+	res = query.run(as_dict=True, debug=debug)
+	res = transform_avatar(doctype, res)
+	res = transform_assign(res)
+	return res
 
 
 @frappe.whitelist()
@@ -136,3 +140,23 @@ def apply_hook(doctype: str, query):
 		return _function(query)
 	except Exception:
 		return query
+
+
+def transform_avatar(doctype: str, r):
+	m = frappe.get_meta(doctype)
+	f = [i for i in m.fields if i.fieldtype == "Link" and i.options == "User"]
+	for i in f:
+		for j in r:
+			if j.get(i.fieldname):
+				j[i.fieldname] = get_user_info_for_avatar(j[i.fieldname])
+	return r
+
+
+def transform_assign(r):
+	for row in r:
+		if assign := row.get("_assign"):
+			j = frappe.parse_json(assign)
+			if len(j) < 1:
+				continue
+			row["assignee"] = get_user_info_for_avatar(j.pop())
+	return r
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/api.py b/helpdesk/helpdesk/doctype/hd_ticket/api.py
index 722a95ed5..9b979a273 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/api.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/api.py
@@ -1,5 +1,6 @@
 import frappe
 from frappe import _
+from frappe.utils import get_user_info_for_avatar
 from frappe.utils.caching import redis_cache
 from pypika import Criterion, Order
 
@@ -20,13 +21,9 @@ def new(doc, attachments=[]):
 @frappe.whitelist()
 def get_one(name):
 	check_permissions("HD Ticket", None)
-	QBActivity = frappe.qb.DocType("HD Ticket Activity")
-	QBComment = frappe.qb.DocType("HD Ticket Comment")
-	QBCommunication = frappe.qb.DocType("Communication")
 	QBContact = frappe.qb.DocType("Contact")
 	QBFeedback = frappe.qb.DocType("HD Ticket Feedback Option")
 	QBTicket = frappe.qb.DocType("HD Ticket")
-	QBViewLog = frappe.qb.DocType("View Log")
 
 	_is_agent = is_agent()
 
@@ -61,18 +58,47 @@ def get_one(name):
 	if contact:
 		contact = contact[0]
 
-	comments = (
-		frappe.qb.from_(QBComment)
-		.select(
-			QBComment.commented_by,
-			QBComment.content,
-			QBComment.creation,
-			QBComment.is_pinned,
-			QBComment.name,
-		)
-		.where(QBComment.reference_ticket == name)
-		.orderby(QBComment.creation, order=Order.asc)
+	feedback = (
+		frappe.qb.from_(QBFeedback)
+		.select(QBFeedback.name, QBFeedback.label, QBFeedback.rating)
+		.where(QBFeedback.name == ticket.feedback)
 	)
+
+	return {
+		**ticket,
+		"assignee": get_assignee(ticket._assign),
+		"communications": get_communications(name),
+		"comments": get_comments(name),
+		"contact": contact,
+		"feedback": feedback.run(as_dict=True).pop() if ticket.feedback else None,
+		"history": get_history(name),
+		"template": get_template(ticket.template or DEFAULT_TICKET_TEMPLATE),
+		"views": get_views(name),
+	}
+
+
+def get_customer_criteria():
+	QBTicket = frappe.qb.DocType("HD Ticket")
+
+	user = frappe.session.user
+	customer = get_customer(user)
+	conditions = [
+		QBTicket.contact == user,
+		QBTicket.customer == customer,
+		QBTicket.raised_by == user,
+	]
+	return Criterion.any(conditions)
+
+
+def get_assignee(_assign: str):
+	j = frappe.parse_json(_assign)
+	if len(j) < 1:
+		return
+	return get_user_info_for_avatar(j.pop())
+
+
+def get_communications(ticket: str):
+	QBCommunication = frappe.qb.DocType("Communication")
 	communications = (
 		frappe.qb.from_(QBCommunication)
 		.select(
@@ -84,27 +110,58 @@ def get_one(name):
 			QBCommunication.sender,
 		)
 		.where(QBCommunication.reference_doctype == "HD Ticket")
-		.where(QBCommunication.reference_name == name)
+		.where(QBCommunication.reference_name == ticket)
 		.orderby(QBCommunication.creation, order=Order.asc)
 		.run(as_dict=True)
 	)
-	feedback = (
-		frappe.qb.from_(QBFeedback)
-		.select(QBFeedback.name, QBFeedback.label, QBFeedback.rating)
-		.where(QBFeedback.name == ticket.feedback)
-	)
-
 	for c in communications:
 		c.attachments = get_attachments("Communication", c.name)
+		c.user = get_user_info_for_avatar(c.sender)
+	return communications
+
 
+def get_comments(ticket: str):
+	if not frappe.has_permission("HD Ticket Comment", "read"):
+		return []
+	QBComment = frappe.qb.DocType("HD Ticket Comment")
+	comments = (
+		frappe.qb.from_(QBComment)
+		.select(
+			QBComment.commented_by,
+			QBComment.content,
+			QBComment.creation,
+			QBComment.is_pinned,
+			QBComment.name,
+		)
+		.where(QBComment.reference_ticket == ticket)
+		.orderby(QBComment.creation, order=Order.asc)
+		.run(as_dict=True)
+	)
+	for c in comments:
+		c.user = get_user_info_for_avatar(c.commented_by)
+	return comments
+
+
+def get_history(ticket: str):
+	if not frappe.has_permission("HD Ticket Activity", "read"):
+		return []
+	QBActivity = frappe.qb.DocType("HD Ticket Activity")
 	history = (
 		frappe.qb.from_(QBActivity)
 		.select(
 			QBActivity.name, QBActivity.action, QBActivity.owner, QBActivity.creation
 		)
-		.where(QBActivity.ticket == name)
+		.where(QBActivity.ticket == ticket)
 		.orderby(QBActivity.creation, order=Order.desc)
 	)
+	history = history.run(as_dict=True)
+	for h in history:
+		h.user = get_user_info_for_avatar(h.owner)
+	return history
+
+
+def get_views(ticket: str):
+	QBViewLog = frappe.qb.DocType("View Log")
 	views = (
 		frappe.qb.from_(QBViewLog)
 		.select(
@@ -113,33 +170,13 @@ def get_one(name):
 			QBViewLog.viewed_by,
 		)
 		.where(QBViewLog.reference_doctype == "HD Ticket")
-		.where(QBViewLog.reference_name == name)
+		.where(QBViewLog.reference_name == ticket)
 		.orderby(QBViewLog.creation, order=Order.desc)
+		.run(as_dict=True)
 	)
-
-	return {
-		**ticket,
-		"comments": comments.run(as_dict=True) if _is_agent else [],
-		"communications": communications,
-		"contact": contact,
-		"feedback": feedback.run(as_dict=True).pop() if ticket.feedback else None,
-		"history": history.run(as_dict=True) if _is_agent else [],
-		"template": get_template(ticket.template or DEFAULT_TICKET_TEMPLATE),
-		"views": views.run(as_dict=True) if _is_agent else [],
-	}
-
-
-def get_customer_criteria():
-	QBTicket = frappe.qb.DocType("HD Ticket")
-
-	user = frappe.session.user
-	customer = get_customer(user)
-	conditions = [
-		QBTicket.contact == user,
-		QBTicket.customer == customer,
-		QBTicket.raised_by == user,
-	]
-	return Criterion.any(conditions)
+	for v in views:
+		v.user = get_user_info_for_avatar(v.viewed_by)
+	return views
 
 
 @redis_cache()
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
index d8648e7eb..c8bc780be 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
@@ -368,24 +368,13 @@
  "icon": "fa fa-issue",
  "idx": 61,
  "links": [],
- "modified": "2023-09-18 13:04:58.499150",
+ "modified": "2023-09-27 17:10:20.664187",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Support Team",
-   "share": 1,
-   "write": 1
-  },
   {
    "create": 1,
    "delete": 1,
@@ -407,13 +396,11 @@
    "read": 1,
    "report": 1,
    "role": "Agent",
-   "select": 1,
    "share": 1,
    "write": 1
   },
   {
    "create": 1,
-   "delete": 1,
    "email": 1,
    "export": 1,
    "if_owner": 1,
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 2c31bb61b..8e33f791d 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -148,6 +148,16 @@ def by_priority(query: Query, direction: Order):
 			"Last modified on": "modified",
 		}
 
+	def has_permission(self, perm):
+		has_standard_permissions = super().has_permission(perm)
+		user = frappe.session.user
+		customer = get_customer(user)
+		is_customer = self.customer == customer
+		is_contact = self.contact == user
+		is_raised = self.raised_by == user
+		has_extra_permissions = is_customer or is_contact or is_raised
+		return has_standard_permissions or has_extra_permissions
+
 	def publish_update(self):
 		publish_event("helpdesk:ticket-update", {"name": self.name})
 		capture_event("ticket_updated")
diff --git a/helpdesk/helpdesk/doctype/hd_ticket_comment/hd_ticket_comment.json b/helpdesk/helpdesk/doctype/hd_ticket_comment/hd_ticket_comment.json
index 3bd2de0ea..b05a3737b 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket_comment/hd_ticket_comment.json
+++ b/helpdesk/helpdesk/doctype/hd_ticket_comment/hd_ticket_comment.json
@@ -45,7 +45,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-07-30 20:10:04.958324",
+ "modified": "2023-09-25 13:06:01.197664",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket Comment",
@@ -66,6 +66,7 @@
   },
   {
    "create": 1,
+   "delete": 1,
    "email": 1,
    "export": 1,
    "print": 1,
diff --git a/helpdesk/patches.txt b/helpdesk/patches.txt
index 1bf641fd4..2f3efd4a0 100644
--- a/helpdesk/patches.txt
+++ b/helpdesk/patches.txt
@@ -14,3 +14,4 @@ helpdesk.helpdesk.doctype.hd_ticket_feedback_option.patches.ootb
 helpdesk.helpdesk.doctype.hd_ticket_feedback_option.patches.label_as_name
 helpdesk.helpdesk.doctype.hd_service_level_agreement.patches.missing_sla_creation
 helpdesk.helpdesk.doctype.hd_ticket.patches.replace_overdue_failed
+helpdesk.patches.create_helpdesk_folder
diff --git a/helpdesk/patches/create_helpdesk_folder.py b/helpdesk/patches/create_helpdesk_folder.py
new file mode 100644
index 000000000..8defb05a0
--- /dev/null
+++ b/helpdesk/patches/create_helpdesk_folder.py
@@ -0,0 +1,5 @@
+from ..setup.file import create_helpdesk_folder
+
+
+def execute():
+	create_helpdesk_folder()
diff --git a/helpdesk/setup/file.py b/helpdesk/setup/file.py
new file mode 100644
index 000000000..a24677ddd
--- /dev/null
+++ b/helpdesk/setup/file.py
@@ -0,0 +1,9 @@
+import frappe
+
+
+def create_helpdesk_folder():
+	f = frappe.new_doc("File")
+	f.file_name = "Helpdesk"
+	f.is_folder = 1
+	f.folder = "Home"
+	f.insert(ignore_if_duplicate=True)
diff --git a/helpdesk/setup/install.py b/helpdesk/setup/install.py
index 1c0ec33bc..f5f5d7272 100644
--- a/helpdesk/setup/install.py
+++ b/helpdesk/setup/install.py
@@ -4,8 +4,9 @@
 from frappe.permissions import add_permission
 
 from .default_template import create_default_template
+from .file import create_helpdesk_folder
 from .ticket_feedback import create_ticket_feedback_options
-from .ticket_type import create_ootb_ticket_types, create_fallback_ticket_type
+from .ticket_type import create_fallback_ticket_type, create_ootb_ticket_types
 from .welcome_ticket import create_welcome_ticket
 
 
@@ -23,6 +24,7 @@ def after_install():
 	add_system_preset_filters()
 	create_default_template()
 	create_fallback_ticket_type()
+	create_helpdesk_folder()
 	create_ootb_ticket_types()
 	create_welcome_ticket()
 	create_ticket_feedback_options()