diff --git a/admin/modals/api/api_key_add.php b/admin/modals/api/api_key_add.php
index 3714fe9d..3c341b9e 100644
--- a/admin/modals/api/api_key_add.php
+++ b/admin/modals/api/api_key_add.php
@@ -2,8 +2,8 @@
 
 require_once '../../../includes/modal_header.php';
 
-$key = randomString(32);
-$decryptPW = randomString(32);
+$key = randomString(43);
+$decryptPW = randomString(43);
 
 ob_start();
 ?>
diff --git a/agent/post/invoice.php b/agent/post/invoice.php
index f6366d42..824da9c1 100644
--- a/agent/post/invoice.php
+++ b/agent/post/invoice.php
@@ -659,7 +659,7 @@ if (isset($_POST['export_invoices_csv'])) {
         $file_name_date = date('Y-m-d_H-i-s');
     }
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query $client_query ORDER BY invoice_number ASC");
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE $date_query AND $client_query ORDER BY invoice_number ASC");
 
     $num_rows = mysqli_num_rows($sql);