diff --git a/agent/dashboard.php b/agent/dashboard.php
index 546164f1..b07bce4f 100644
--- a/agent/dashboard.php
+++ b/agent/dashboard.php
@@ -729,13 +729,22 @@ if ($user_config_dashboard_technical_enable == 1) {
                                     $client_name = nullable_htmlentities($row['client_name']);
                                     $contact_id = intval($row['ticket_contact_id']);
                                     $contact_name = nullable_htmlentities($row['contact_name']);
+                                    if ($client_id) {
+                                        $has_client = "&client_id=$client_id";
+                                    } else {
+                                        $has_client = "";
+                                    }
 
                                     $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info");
                                     $contact_display = empty($contact_name) ? "-" : "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id'>$contact_name</a>";
                                 ?>
                                     <tr class="<?php echo empty($ticket_updated_at) ? 'text-bold' : ''; ?>">
-                                        <td><a class="text-dark" href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
-                                        <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                        <td>
+                                            <a class="text-dark" 
+                                                href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>"><?= "$ticket_prefix$ticket_number" ?>   
+                                            </a>
+                                        </td>
+                                        <td><a href="ticket.php?ticket_id=<?= $ticket_id$has_client" ?>"><?= $ticket_subject ?></a></td>
                                         <td><a href="tickets.php?client_id=<?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong></a></td>
                                         <td><?php echo $contact_display; ?></td>
                                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></td>
diff --git a/agent/includes/inc_all_client.php b/agent/includes/inc_all_client.php
index 55e6e3c2..21321c24 100644
--- a/agent/includes/inc_all_client.php
+++ b/agent/includes/inc_all_client.php
@@ -29,8 +29,8 @@ if (isset($_GET['client_id'])) {
     $sql = mysqli_query(
         $mysqli,
         "SELECT * FROM clients
-        LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1
-        LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+        LEFT JOIN locations ON client_id = location_client_id AND location_primary = 1
+        LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
         WHERE client_id = $client_id"
     );
 
diff --git a/agent/ticket.php b/agent/ticket.php
index 6b8ce285..33e8cafc 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -39,7 +39,7 @@ if (isset($_GET['ticket_id'])) {
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
         LEFT JOIN categories ON ticket_category = category_id
         WHERE ticket_id = $ticket_id
-        $access_permission_query
+        
         LIMIT 1"
     );
 
diff --git a/agent/ticket_list.php b/agent/ticket_list.php
index 792660f2..fc0d39ab 100644
--- a/agent/ticket_list.php
+++ b/agent/ticket_list.php
@@ -108,6 +108,11 @@
                             $contact_id = intval($row['contact_id']);
                             $contact_name = nullable_htmlentities($row['contact_name']);
                             $contact_email = nullable_htmlentities($row['contact_email']);
+                            if ($client_id) {
+                                $has_client = "&client_id=$client_id";
+                            } else {
+                                $has_client = "";
+                            }
 
                             if ($ticket_priority == "High") {
                                 $ticket_priority_color = "danger";
@@ -197,14 +202,14 @@
                                 
                                 <!-- Ticket Number -->
                                 <td>
-                                    <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>">
+                                    <a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>">
                                         <span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span>
                                     </a>
                                 </td>
 
                                 <!-- Ticket Subject -->
                                 <td>
-                                    <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_subject ?></a>
+                                    <a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>"><?= $ticket_subject ?></a>
 
                                     <?php if($task_count && $completed_task_count > 0) { ?>
                                     <div class="progress mt-2" style="height: 20px;">