diff --git a/client_tickets.php b/client_tickets.php
index 8a02804d..605dd79a 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -18,6 +18,12 @@ if (isset($_GET['status']) && ($_GET['status']) == 'Open') {
     $ticket_status_snippet = "ticket_status != 'Closed'";
 }
 
+if (isset($_GET['unbilled']) && ($_GET['billable']) == '1') {
+    $billable = '1';
+    $ticket_billable_snippet = " AND ticket_billable = 1";
+    $ticket_status_snippet = $ticket_status_snippet . $ticket_billable_snippet;
+}
+
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
diff --git a/report_tickets_unbilled.php b/report_tickets_unbilled.php
index f9fda38a..6253028f 100644
--- a/report_tickets_unbilled.php
+++ b/report_tickets_unbilled.php
@@ -142,11 +142,13 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
                         $row = mysqli_fetch_array($sql_ticket_unbilled_count);
                         $ticket_unbilled_count = intval($row['ticket_unbilled_count']);
 
-                        if ($ticket_raised_count > 0) {
+                        if ($ticket_unbilled_count > 0) {
                             ?>
 
                             <tr>
-                                <td><?php echo $client_name; ?></td>
+                                <td>
+                                    <a href="client_tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
+                                </td>
                                 <td class="text-right"><?php echo $ticket_raised_count; ?></td>
                                 <td class="text-right"><?php echo $ticket_closed_count; ?></td>
                                 <td class="text-right"><?php echo $ticket_unbilled_count; ?></td>