diff --git a/user/modals/asset/asset_bulk_add_ticket.php b/user/modals/asset/asset_bulk_add_ticket.php
index e6cbaf1d..18472d66 100644
--- a/user/modals/asset/asset_bulk_add_ticket.php
+++ b/user/modals/asset/asset_bulk_add_ticket.php
@@ -8,8 +8,6 @@
                 </button>
             </div>
             
-            <input type="hidden" name="bulk_billable" value="0">
-            <input type="hidden" name="bulk_client" value="<?php echo $client_id; ?>">
             <div class="modal-body">
 
                 <div class="form-group">
@@ -104,7 +102,7 @@
                             <option value="0">- None -</option>
                             <?php
 
-                            $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_client_id = $client_id AND project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+                            $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
                             while ($row = mysqli_fetch_array($sql_projects)) {
                                 $project_id_select = intval($row['project_id']);
                                 $project_name_select = nullable_htmlentities($row['project_name']); ?>
diff --git a/user/modals/asset/asset_bulk_transfer_client.php b/user/modals/asset/asset_bulk_transfer_client.php
index 1c1ccb89..4b6a6228 100644
--- a/user/modals/asset/asset_bulk_transfer_client.php
+++ b/user/modals/asset/asset_bulk_transfer_client.php
@@ -1,3 +1,11 @@
+<?php 
+if ($client_url) {
+    $client_select_query = "AND client_id != $client_id";
+} else {
+    $client_select_query = '';
+}
+?>
+
 <div class="modal" id="bulkTransferAssetClientModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -17,9 +25,9 @@
                             <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
                         </div>
                         <select class="form-control select2" name="bulk_client_id">
-                            <option value="">- Client -</option>
+                            <option value="">- Select Client -</option>
                             <?php
-                                $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_id != $client_id AND client_archived_at IS NULL");
+                                $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
                         
                                 while ($row = mysqli_fetch_array($clients_sql)) {
                                     $client_id_select = intval($row["client_id"]);
diff --git a/user/post/ticket.php b/user/post/ticket.php
index 84a09e0a..591ba3a3 100644
--- a/user/post/ticket.php
+++ b/user/post/ticket.php
@@ -1415,7 +1415,6 @@ if (isset($_POST['bulk_add_asset_ticket'])) {
 
     enforceUserPermission('module_support', 2);
 
-    $client_id = intval($_POST['bulk_client']);
     $assigned_to = intval($_POST['bulk_assigned_to']);
     if ($assigned_to == 0) {
         $ticket_status = 1;
@@ -1429,7 +1428,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) {
     $project_id = intval($_POST['bulk_project']);
     $use_primary_contact = intval($_POST['use_primary_contact']);
     $ticket_template_id = intval($_POST['bulk_ticket_template_id']);
-    $billable = intval($_POST['bulk_billable']);
+    $billable = intval($_POST['bulk_billable'] ?? 0);
 
     // Check to see if adding a ticket by template
     if($ticket_template_id) {
@@ -1460,6 +1459,7 @@ if (isset($_POST['bulk_add_asset_ticket'])) {
             $row = mysqli_fetch_array($sql);
 
             $asset_name = sanitizeInput($row['asset_name']);
+            $client_id = intval($row['asset_client_id']);
 
             $subject_asset_prepended = "$asset_name - $subject";