diff --git a/agent/invoices.php b/agent/invoices.php
index 826fb19c..128544b9 100644
--- a/agent/invoices.php
+++ b/agent/invoices.php
@@ -362,7 +362,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                             </td>
                             <td class="text-bold">
-                                <a href="invoice.php?<?php echo $client_url; ?>invoice_id=<?php echo $invoice_id; ?>">
+                                <a href="invoice.php?client_id=<?= $client_id ?>&invoice_id=<?= $invoice_id ?>">
                                 <?php echo "$invoice_prefix$invoice_number"; ?>
                                 </a>
                             </td>
diff --git a/agent/quotes.php b/agent/quotes.php
index 7819a531..b8ec96f1 100644
--- a/agent/quotes.php
+++ b/agent/quotes.php
@@ -187,7 +187,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <tr>
                         <td class="text-bold">
-                            <a href="quote.php?<?php echo $client_url; ?>quote_id=<?php echo $quote_id; ?>">
+                            <a href="quote.php?client_id=<?= $client_id ?>&quote_id=<?= $quote_id ?>">
                                 <?php echo "$quote_prefix$quote_number"; ?>
                             </a>
                         </td>
diff --git a/agent/recurring_invoices.php b/agent/recurring_invoices.php
index 33ea95cc..8b12bef0 100644
--- a/agent/recurring_invoices.php
+++ b/agent/recurring_invoices.php
@@ -189,7 +189,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <tr>
                         <td class="text-bold">
-                            <a href="recurring_invoice.php?<?php echo $client_url; ?>recurring_invoice_id=<?php echo $recurring_invoice_id; ?>">
+                            <a href="recurring_invoice.php?client_id=<?= $client_id ?>&recurring_invoice_id=<?= $recurring_invoice_id ?>">
                                 <?php echo "$recurring_invoice_prefix$recurring_invoice_number"; ?>
                             </a>
                         </td>