diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3078808c..e62ab9cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ This file documents all notable changes made to ITFlow.
 - Asset Transfer: Fix.
 - Ticket Listing: Restrict Tickets presented in ticket list view from client restricted agents.
 - Ticket Details: Deny access to client restricted agents to view tickets without client_id in uri.
+- Tickets: Allow agents with restricted client access to view and edit tickets without a client.
+- Ticket Change client: Limit selection for agents with restricted client access. 
 
 ### New Features & Updates 
 - Report: Added Client Detail Auditing.
diff --git a/agent/modals/ticket/ticket_edit.php b/agent/modals/ticket/ticket_edit.php
index d5556765..871d5c3b 100644
--- a/agent/modals/ticket/ticket_edit.php
+++ b/agent/modals/ticket/ticket_edit.php
@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-// Ticket client access overide
+// Ticket client access overide - This is the only way to show tickets without a client to agents with restricted client access
 $access_permission_query_overide = '';
-if (!empty($client_access_string)) {
+if ($client_access_string) {
     $access_permission_query_overide = "AND ticket_client_id IN (0,$client_access_string)";
 }
 
diff --git a/agent/ticket.php b/agent/ticket.php
index c687db64..9cfdb419 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -9,9 +9,9 @@ if (isset($_GET['client_id'])) {
     $client_url = '';
 }
 
-// Ticket client access overide
+// Ticket client access overide - This is the only way to show tickets without a client to agents with restricted client access
 $access_permission_query_overide = '';
-if (!empty($client_access_string)) {
+if ($client_access_string) {
     $access_permission_query_overide = "AND ticket_client_id IN (0,$client_access_string)";
 }
 
@@ -356,11 +356,10 @@ if (isset($_GET['ticket_id'])) {
                         <i class="fa fa-fw fa-2x fa-life-ring mr-2"></i>
                         <div class="media-body">
                             <div class="text-bold">Ticket <?= "$ticket_prefix$ticket_number" ?>
-                                <span class='badge badge-pill text-light ml-1' style="background-color: <?= $ticket_status_color ?>">
+                                <span class='badge badge-pill text-light ml-1 p-2' style="background-color: <?= $ticket_status_color ?>">
                                     <?= $ticket_status_name ?>
                                 </span>
                             </div>
-                            <span class="text-secondary"><?= $ticket_subject ?></span>
                         </div>
                     </div>
                 </div>
@@ -446,10 +445,11 @@ if (isset($_GET['ticket_id'])) {
 
             <div class="card card-body">
 
-                <div title="<?php echo $ticket_updated_at; ?>">
+                <?php if ($ticket_updated_at) { ?>
+                <div title="<?= $ticket_updated_at ?>">
                     <i class="fa fa-fw fa-history text-secondary mr-2"></i>Updated: <strong><?= date('M d, Y • g:i A', strtotime($ticket_updated_at)) . "</strong> <span class='text-muted small'>($ticket_updated_at_ago)</span>" ?>
                 </div>
-
+                <?php } ?>
                 <!-- Ticket assign (disable if closed -->
                 <?php if (empty($ticket_closed_at)) { ?>
                     <div class="mt-1">
@@ -542,9 +542,7 @@ if (isset($_GET['ticket_id'])) {
                 <div class="card card-dark mb-3">
 
                     <div class="card-header px-3 py-2">
-                        <h5 class="card-title mt-1">
-                            Description / Comments
-                        </h5>
+                        <h5 class="card-title mt-1"><?= $ticket_subject ?></h5>
                         <?php if (empty($ticket_closed_at)) { ?>
                         <div class="card-tools">
                             <button type="button" class="btn btn-tool ajax-modal" data-modal-url="modals/ticket/ticket_edit.php?id=<?= $ticket_id ?>" data-modal-size="lg"><i class="fas fa-edit"></i></button>
diff --git a/agent/tickets.php b/agent/tickets.php
index e9a5d4b1..0cf77b8a 100644
--- a/agent/tickets.php
+++ b/agent/tickets.php
@@ -88,9 +88,9 @@ if (isset($_GET['project']) & !empty($_GET['project']) && $_GET['project'] > '0'
     $ticket_project_filter_id = intval($_GET['project']);
 }
 
-// Ticket client access overide
+// Ticket client access overide - This is the only way to show tickets without a client to agents with restricted client access
 $access_permission_query_overide = '';
-if (!empty($client_access_string)) {
+if ($client_access_string) {
     $access_permission_query_overide = "AND ticket_client_id IN (0,$client_access_string)";
 }