diff --git a/post/invoice.php b/post/invoice.php
index 6b74699f..435383ee 100644
--- a/post/invoice.php
+++ b/post/invoice.php
@@ -686,14 +686,14 @@ if (isset($_POST['add_payment'])) {
                     'body' => $body
                 ];
 
-                $email_data = $email;
+                $email_data[] = $email;
 
                 // Get Email ID for reference
                 $email_id = mysqli_insert_id($mysqli);
 
                 // Email Logging
 
-                $_SESSION['alert_message'] .= "Email receipt sent ";
+                $_SESSION['alert_message'] = "Email receipt sent ";
 
                 mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id");
 
@@ -719,7 +719,7 @@ if (isset($_POST['add_payment'])) {
                     'body' => $body
                 ];
 
-                $email_data = $email;
+                $email_data[] = $email;
 
                 // Get Email ID for reference
                 $email_id = mysqli_insert_id($mysqli);
@@ -736,7 +736,7 @@ if (isset($_POST['add_payment'])) {
 
         // Add emails to queue
         if (!empty($email)) {
-            addToMailQueue($mysqli, $email);
+            addToMailQueue($mysqli, $email_data);
         }
 
         //Update Invoice Status
diff --git a/ticket.php b/ticket.php
index 1179fb99..ca898d4e 100644
--- a/ticket.php
+++ b/ticket.php
@@ -638,7 +638,7 @@ if (isset($_GET['ticket_id'])) {
                         </div>
                     <?php } ?>
 
-                    <?php if (!empty($ticket_billable)) { ?>
+                    <?php if ($config_module_enable_accounting) { ?>
                         <div class="mt-1">
                             <i class="fa fa-fw fa-dollar-sign text-secondary ml-1 mr-2"></i>Billable:
                             <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
@@ -830,7 +830,7 @@ if (isset($_GET['ticket_id'])) {
                 </form>
 
                 <div class="card card-body card-outline card-dark mb-2">
-                    <?php if ($config_module_enable_accounting) { ?>
+                    <?php if ($config_module_enable_accounting && $ticket_billable == 1) { ?>
                         <a href="#" class="btn btn-info btn-block" href="#" data-toggle="modal" data-target="#addInvoiceFromTicketModal">
                             <i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice Ticket
                         </a>
@@ -864,10 +864,10 @@ if (isset($_GET['ticket_id'])) {
 
         require_once "ticket_merge_modal.php";
 
-        require_once "ticket_invoice_add_modal.php";
-
-        require_once "ticket_edit_billable_modal.php";
-
+        if ($config_module_enable_accounting) {
+            require_once "ticket_edit_billable_modal.php";
+            require_once "ticket_invoice_add_modal.php";
+        }
 
     }
 
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 63e35c14..2313e61a 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -62,6 +62,8 @@
                                 </div>
                             </div>
 
+                            <?php if ($config_module_enable_accounting) {
+                                ?>
                             <div class="form-group">
                                 <label>Billable</label>
                                 <div class="input-group">
@@ -73,8 +75,9 @@
                                         <option <?php if ($ticket_billable == 0) { echo "selected"; } ?> value="0">No</option>
                                     </select>
                                 </div>
-
                             </div>
+                            <?php } ?>
+
 
                         </div>
 
diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php
index e219564c..d3de8af3 100644
--- a/ticket_invoice_add_modal.php
+++ b/ticket_invoice_add_modal.php
@@ -121,10 +121,13 @@ $addToExistingInvoice = isset($_GET['ticket_id']) && isset($_GET['invoice_id']);
                                             $invoice_due = nullable_htmlentities($row['invoice_due']);
                                             $invoice_amount = floatval($row['invoice_amount']);
 
+                                            if (isset($invoice_id)) {
                                             ?>
-                                        <option value="<?php echo $invoice_id; ?>" <?php if ($invoice_id == $_GET['invoice_id']) echo "selected"; ?>><?php echo "$invoice_prefix$invoice_number $invoice_scope"; ?></option>
-
+                                            <option value="<?php echo $invoice_id; ?>" <?php if ($invoice_id == $_GET['invoice_id']) { 
+                                                echo "selected";
+                                                }?>><?php echo "$invoice_prefix$invoice_number $invoice_scope"; ?></option>
                                             <?php
+                                            }
                                         }
                                         ?>
                                     </select>
@@ -150,7 +153,9 @@ $addToExistingInvoice = isset($_GET['ticket_id']) && isset($_GET['invoice_id']);
                     <div class="form-group">
                         <label>Item Description</label>
                         <div class="input-group">
-                            <textarea class="form-control" rows="5" name="item_description"><?php echo "# $contact_name - $asset_name - $ticket_date\nTicket $ticket_prefix$ticket_number\n$ticket_subject\nTT: $ticket_total_reply_time"; ?></textarea>
+                            <textarea class="form-control" rows="5" name="item_description">
+                                <?php echo "# $contact_name - $asset_name - $ticket_date\nTicket $ticket_prefix$ticket_number\n$ticket_subject\nTT: $ticket_total_reply_time"; ?>
+                            </textarea>
                         </div>
                     </div>
 
diff --git a/tickets.php b/tickets.php
index 9ef0fe72..375b8318 100644
--- a/tickets.php
+++ b/tickets.php
@@ -242,30 +242,36 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                 } ?>">
                 <tr>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">Number</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">Number</a>
                     </th>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">Subject</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">Subject</a>
                     </th>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client / Contact</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client / Contact</a>
+                    </th>
+                    <?php if ($config_module_enable_accounting) {
+                        ?>
+                        <th class="text-center"><a class="text-dark"
+                            href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_billable&order=<?php echo $disp; ?>">Billable</a>
+                        </th>
+                        <?php
+                    }
+                    ?>
+
+                    <th><a class="text-dark"
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">Priority</a>
                     </th>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_billable&order=<?php echo $disp; ?>">Billable</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">Status</a>
+                    <th><a class="text-dark"
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">Assigned</a>
                     </th>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">Priority</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">Last Response</a>
                     </th>
                     <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">Status</a>
-                    <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">Assigned</a>
-                    </th>
-                    <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">Last Response</a>
-                    </th>
-                    <th><a class="text-dark"
-                           href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_created_at&order=<?php echo $disp; ?>">Created</a>
+                        href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_created_at&order=<?php echo $disp; ?>">Created</a>
                     </th>
 
                 </tr>
@@ -364,6 +370,8 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
 
                             <div class="mt-1"><?php echo $contact_display; ?></div>
                         </td>
+                        <?php if ($config_module_enabled_accounting) {
+                                ?>
                         <td class="text-center">
                             <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
                             <?php
@@ -373,6 +381,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                 echo "<span class='badge badge-pill badge-secondary'>X</span>";
                             }
                         ?></td>
+                        <?php
+                            }
+                        ?>
                         <td><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></a></td>
                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status; ?></span></td>
                         <td><a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a></td>
@@ -393,7 +404,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
 
                         require "ticket_edit_priority_modal.php";
 
-                        require "ticket_edit_billable_modal.php";
+                        if ($config_module_enable_accounting) {
+                            require "ticket_edit_billable_modal.php";
+                        }
 
                     }