diff --git a/helpdesk/templates/helpdesk/ticket/ticket_detail.html b/helpdesk/templates/helpdesk/ticket/ticket_detail.html
index 6b4ff6f1a..75db07d32 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_detail.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_detail.html
@@ -340,7 +340,7 @@
                 </div>
               </div>
               <!-- start of comment box. -->
-              {% if perms.helpdesk.add_comment or request.user.employee_get == ticket.employee_id %}
+              {% if perms.helpdesk.add_comment or request.user.employee_get == ticket.employee_id or request.user.employee_get in ticket.assigned_to.all %}
                 <div class="oh-helpdesk__chatbox">
                   <form name="comment-form" action="{% url 'comment-create' ticket.id %}" method="POST" enctype="multipart/form-data" class="oh-chat oh-chat__input-wrapper">
                     {% csrf_token %}
diff --git a/helpdesk/templates/helpdesk/ticket/ticket_list.html b/helpdesk/templates/helpdesk/ticket/ticket_list.html
index 6e9e97b11..1ab5a3ba4 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_list.html
@@ -367,7 +367,10 @@
 								<div class="oh-sticky-table__tbody">
 									{% for ticket in allocated_tickets %}
 										<div class="oh-sticky-table__tr"
-											{% if request.user.employee_get in ticket.assigned_to.all or perms.helpdesk.view_ticket or request.user.employee_get|is_department_manager:ticket %}
+											{% if request.user.employee_get in ticket.assigned_to.all %}
+												style = "background-color: lightgreen;"
+												onclick="window.location.href = `{% url 'ticket-detail' ticket.id %}`"
+											{% elif perms.helpdesk.view_ticket or request.user.employee_get|is_department_manager:ticket %}
 												onclick="window.location.href = `{% url 'ticket-detail' ticket.id %}`"
 											{% else %}
 												hx-get = "{% url 'ticket-individual-view' ticket.id %}"
diff --git a/helpdesk/views.py b/helpdesk/views.py
index cd23f9079..b60138374 100644
--- a/helpdesk/views.py
+++ b/helpdesk/views.py
@@ -591,7 +591,7 @@ def ticket_archive(request, ticket_id):
 
 
 @login_required
-@ticket_owner_can_enter(perm="helpdesk.change_ticket", model=Ticket)
+# @ticket_owner_can_enter(perm="helpdesk.change_ticket", model=Ticket)
 def change_ticket_status(request, ticket_id):
     """
     This function is responsible for changing the Ticket status.