diff --git a/api_key_add_modal.php b/api_key_add_modal.php
index 8b839759..5303699f 100644
--- a/api_key_add_modal.php
+++ b/api_key_add_modal.php
@@ -2,86 +2,81 @@
 $key = randomString(156);
 ?>
 <div class="modal" id="addApiKeyModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> New Key</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body bg-white">
-
-          <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-          <input type="hidden" name="key" value="<?php echo $key ?>">
-
-          <div class="form-group">
-            <label>API Key <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-              </div>
-              <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
-              <div class="input-group-append">
-                <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
-              </div>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> New Key</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
 
-          <hr>
+                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                    <input type="hidden" name="key" value="<?php echo $key ?>">
 
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Key Name" required autofocus>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>API Key <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                            </div>
+                            <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
+                            <div class="input-group-append">
+                                <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                            </div>
+                        </div>
+                    </div>
 
-          <div class="form-group">
-            <label>Expiration Date <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-              </div>
-              <input type="date" class="form-control" name="expire" max="2999-12-31" required>
-            </div>
-          </div>
+                    <hr>
 
-          <div class="form-group">
-            <label>Client <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <select class="form-control select2" name="client" required>
-                <option value="">- Client -</option>
-                <option value="0"> ALL CLIENTS </option>
-                <?php
+                    <div class="form-group">
+                        <label>Name <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="name" placeholder="Key Name" required autofocus>
+                        </div>
+                    </div>
 
-                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
-                while ($row = mysqli_fetch_array($sql)) {
-                  $client_id = $row['client_id'];
-                  $client_name = htmlentities($row['client_name']);
-                  ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
+                    <div class="form-group">
+                        <label>Expiration Date <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="expire" max="2999-12-31" required>
+                        </div>
+                    </div>
 
-                  <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Client <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                            </div>
+                            <select class="form-control select2" name="client" required>
+                                <option value="">- Client -</option>
+                                <option value="0"> ALL CLIENTS </option>
+                                <?php
+                                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id = $row['client_id'];
+                                    $client_name = htmlentities($row['client_name']); ?>
+                                    <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
 
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_api_key" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_api_key" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 85a0a6aa..faaac445 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -11,22 +11,22 @@
                 <div class="modal-body bg-white">
 
                     <?php if (isset($_GET['client_id'])) { ?>
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fa fa-fw fa-life-ring"></i> Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-contacts"><i class="fa fa-fw fa-users"></i> Contacts</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-assets"><i class="fa fa-fw fa-desktop"></i> Assets</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-vendors"><i class="fa fa-fw fa-building"></i> Vendors</a>
-                        </li>              
-                    </ul>
+                        <ul class="nav nav-pills nav-justified mb-3">
+                            <li class="nav-item">
+                                <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fa fa-fw fa-life-ring"></i> Details</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="pill" href="#pills-contacts"><i class="fa fa-fw fa-users"></i> Contacts</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="pill" href="#pills-assets"><i class="fa fa-fw fa-desktop"></i> Assets</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="pill" href="#pills-vendors"><i class="fa fa-fw fa-building"></i> Vendors</a>
+                            </li>
+                        </ul>
 
-                    <hr>
+                        <hr>
 
                     <?php } ?>
 
@@ -49,27 +49,27 @@
                             </div>
 
                             <?php if (empty($_GET['client_id'])) { ?>
-                            
-                            <div class="form-group">
-                                <label>Client <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+
+                                <div class="form-group">
+                                    <label>Client <strong class="text-danger">*</strong></label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                        </div>
+                                        <select class="form-control select2" name="client" required>
+                                            <option value="">- Client -</option>
+                                            <?php
+
+                                            $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $client_id = $row['client_id'];
+                                                $client_name = htmlentities($row['client_name']); ?>
+                                                <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
+
+                                            <?php } ?>
+                                        </select>
                                     </div>
-                                    <select class="form-control select2" name="client" required>
-                                        <option value="">- Client -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $client_id = $row['client_id'];
-                                            $client_name = htmlentities($row['client_name']); ?>
-                                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-
-                                        <?php } ?>
-                                    </select>
                                 </div>
-                            </div>
 
                             <?php } ?>
 
@@ -116,80 +116,80 @@
 
                         <?php if (isset($_GET['client_id'])) { ?>
 
-                        <div class="tab-pane fade" id="pills-contacts">
+                            <div class="tab-pane fade" id="pills-contacts">
 
-                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                            <div class="form-group">
-                                <label>Contact <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="contact" required>
-                                        <option value="">- Contact -</option>
-                                        <?php
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $contact_id = $row['contact_id'];
-                                            $contact_name = htmlentities($row['contact_name']); ?>
-                                            <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
+                                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                                <div class="form-group">
+                                    <label>Contact <strong class="text-danger">*</strong></label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                        </div>
+                                        <select class="form-control select2" name="contact" required>
+                                            <option value="">- Contact -</option>
+                                            <?php
+                                            $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $contact_id = $row['contact_id'];
+                                                $contact_name = htmlentities($row['contact_name']); ?>
+                                                <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
 
                                             <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-assets">
-
-                            <div class="form-group">
-                                <label>Asset</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                                        </select>
                                     </div>
-                                    <select class="form-control select2" name="asset">
-                                        <option value="0">- None -</option>
-                                        <?php
-
-                                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_assets)) {
-                                            $asset_id_select = $row['asset_id'];
-                                            $asset_name_select = htmlentities($row['asset_name']); ?>    
-                                            <option value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-
-                                        <?php } ?>
-                                    </select>
                                 </div>
                             </div>
-                            
-                        </div>
 
-                        <div class="tab-pane fade" id="pills-vendors">
+                            <div class="tab-pane fade" id="pills-assets">
 
-                            <div class="form-group">
-                                <label>Vendor</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                <div class="form-group">
+                                    <label>Asset</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                                        </div>
+                                        <select class="form-control select2" name="asset">
+                                            <option value="0">- None -</option>
+                                            <?php
+
+                                            $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                            while ($row = mysqli_fetch_array($sql_assets)) {
+                                                $asset_id_select = $row['asset_id'];
+                                                $asset_name_select = htmlentities($row['asset_name']); ?>
+                                                <option value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                                            <?php } ?>
+                                        </select>
                                     </div>
-                                    <select class="form-control select2" name="vendor">
-                                        <option value="0">- None -</option>
-                                        <?php
-
-                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_vendors)) {
-                                            $vendor_id_select = $row['vendor_id'];
-                                            $vendor_name_select = htmlentities($row['vendor_name']); ?>    
-                                            <option value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-
-                                        <?php } ?>
-                                    </select>
                                 </div>
+
                             </div>
-                            
-                        </div>
-                        
+
+                            <div class="tab-pane fade" id="pills-vendors">
+
+                                <div class="form-group">
+                                    <label>Vendor</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                        </div>
+                                        <select class="form-control select2" name="vendor">
+                                            <option value="0">- None -</option>
+                                            <?php
+
+                                            $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                                            while ($row = mysqli_fetch_array($sql_vendors)) {
+                                                $vendor_id_select = $row['vendor_id'];
+                                                $vendor_name_select = htmlentities($row['vendor_name']); ?>
+                                                <option value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            </div>
+
                         <?php } ?>
 
                     </div>
@@ -202,4 +202,4 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 5c7f4821..a43097ac 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -23,7 +23,7 @@
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-vendors<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-building"></i> Vendors</a>
-                        </li>       
+                        </li>
                     </ul>
 
                     <hr>
@@ -59,7 +59,7 @@
                                     </select>
                                 </div>
                             </div>
-                    
+
                             <div class="form-group">
                                 <label>Assigned to</label>
                                 <div class="input-group">
@@ -68,7 +68,7 @@
                                     </div>
                                     <select class="form-control select2" name="assigned_to">
                                         <option value="0">Not Assigned</option>
-                                        <?php 
+                                        <?php
 
                                         $sql_assign_to_select = mysqli_query($mysqli,"SELECT users.user_id, user_name FROM users
                                             LEFT JOIN user_companies ON users.user_id = user_companies.user_id
@@ -79,10 +79,10 @@
                                         while ($row = mysqli_fetch_array($sql_assign_to_select)) {
                                             $user_id = $row['user_id'];
                                             $user_name = htmlentities($row['user_name']);
-                                        ?>
-                                        <option <?php if ($ticket_assigned_to == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                                            ?>
+                                            <option <?php if ($ticket_assigned_to == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
 
-                                        <?php
+                                            <?php
                                         }
                                         ?>
                                     </select>
@@ -101,16 +101,16 @@
                                     </div>
                                     <select class="form-control select2" name="contact">
                                         <option value="">No One</option>
-                                        <?php 
-                                        
+                                        <?php
+
                                         $sql_client_contacts_select = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
                                         while ($row = mysqli_fetch_array($sql_client_contacts_select)) {
                                             $contact_id_select = $row['contact_id'];
                                             $contact_name_select = htmlentities($row['contact_name']);
-                                        ?>
-                                        <option <?php if ($contact_id_select == $contact_id) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                                        
-                                        <?php
+                                            ?>
+                                            <option <?php if ($contact_id_select == $contact_id) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+
+                                            <?php
                                         }
                                         ?>
                                     </select>
@@ -135,10 +135,10 @@
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = $row['asset_id'];
                                             $asset_name_select = htmlentities($row['asset_name']);
-                                        ?>
+                                            ?>
                                             <option <?php if (!empty($asset_id) && $asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
 
-                                        <?php
+                                            <?php
                                         }
                                         ?>
                                     </select>
@@ -159,14 +159,14 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                          $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
-                                          while ($row = mysqli_fetch_array($sql_vendors)) {
+                                        $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                        while ($row = mysqli_fetch_array($sql_vendors)) {
                                             $vendor_id_select = $row['vendor_id'];
                                             $vendor_name_select = htmlentities($row['vendor_name']);
                                             ?>
                                             <option <?php if (!empty($vendor_id) && $vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
 
-                                        <?php
+                                            <?php
                                         }
                                         ?>
                                     </select>
@@ -178,14 +178,14 @@
                     </div>
 
                 </div>
-                
+
                 <div class="modal-footer bg-white">
                     <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
                     <button type="submit" name="edit_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Save</button>
                 </div>
-            
+
             </form>
-        
+
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ticket_invoice_add_modal.php b/ticket_invoice_add_modal.php
index 9bb16e42..367fd625 100644
--- a/ticket_invoice_add_modal.php
+++ b/ticket_invoice_add_modal.php
@@ -1,178 +1,178 @@
 <div class="modal" id="addInvoiceFromTicketModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> Invoice ticket</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        
-        <div class="modal-body bg-white">
-         
-          <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-         
-          <div class="form-group">
-            <label>Exisiting Invoice?</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-file-invoice-dollar"></i></span>
-              </div>
-              <select class="form-control select2" name="invoice_id">
-                <option value="0">New Invoice</option>
-                <?php 
-                
-                $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_status NOT LIKE 'Paid' AND invoice_client_id = $client_id AND company_id = $session_company_id ORDER BY invoice_number ASC"); 
-                while ($row = mysqli_fetch_array($sql_invoices)) {
-                  $invoice_id = $row['invoice_id'];
-                  $invoice_prefix = htmlentities($row['invoice_prefix']);
-                  $invoice_number = $row['invoice_number'];
-                  $invoice_scope = htmlentities($row['invoice_scope']);
-                  $invoice_satus = htmlentities($row['invoice_status']);
-                  $invoice_date = $row['invoice_date'];
-                  $invoice_due = $row['invoice_due'];
-                  $invoice_amount = $row['invoice_amount'];
-
-                ?>
-                <option value="<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number $invoice_scope"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> Invoice ticket</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
 
-          <div class="form-group">
-            <label>Invoice Date <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-              </div>
-              <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-            </div>
-          </div>
+                <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Invoice Category <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-              </div>
-              <select class="form-control select2" name="category" required>
-                <option value="">- Category -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
-                while ($row = mysqli_fetch_array($sql)) {
-                  $category_id = $row['category_id'];
-                  $category_name = htmlentities($row['category_name']);
-                ?>
-                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
-              </div>
-            </div>
-          </div>
+                    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
 
-          <div class="form-group">
-            <label>Scope</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-              </div>
-              <input type="text" class="form-control" name="scope" placeholder="Quick description" value="Ticket <?php echo "$ticket_prefix$ticket_number - $ticket_subject"; ?>">
-            </div>
-          </div>
+                    <div class="form-group">
+                        <label>Exisiting Invoice?</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-file-invoice-dollar"></i></span>
+                            </div>
+                            <select class="form-control select2" name="invoice_id">
+                                <option value="0">New Invoice</option>
+                                <?php
 
-          <hr>
+                                $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_status NOT LIKE 'Paid' AND invoice_client_id = $client_id AND company_id = $session_company_id ORDER BY invoice_number ASC");
+                                while ($row = mysqli_fetch_array($sql_invoices)) {
+                                    $invoice_id = $row['invoice_id'];
+                                    $invoice_prefix = htmlentities($row['invoice_prefix']);
+                                    $invoice_number = $row['invoice_number'];
+                                    $invoice_scope = htmlentities($row['invoice_scope']);
+                                    $invoice_satus = htmlentities($row['invoice_status']);
+                                    $invoice_date = $row['invoice_date'];
+                                    $invoice_due = $row['invoice_due'];
+                                    $invoice_amount = $row['invoice_amount'];
 
-          <div class="form-group">
-            <label>Item <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
-              </div>
-              <input type="text" class="form-control" name="item_name" placeholder="Item" required>
-            </div>
-          </div>
+                                    ?>
+                                    <option value="<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number $invoice_scope"; ?></option>
 
-          <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"; ?></textarea>
-            </div>
-          </div>
-          
-          <div class="form-row">
-            <div class="col">
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Invoice Date <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Invoice Category <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category" required>
+                                <option value="">- Category -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $category_id = $row['category_id'];
+                                    $category_name = htmlentities($row['category_name']);
+                                    ?>
+                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                                    <?php
+                                }
+                                ?>
+                            </select>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Scope</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="scope" placeholder="Quick description" value="Ticket <?php echo "$ticket_prefix$ticket_number - $ticket_subject"; ?>">
+                        </div>
+                    </div>
+
+                    <hr>
+
+                    <div class="form-group">
+                        <label>Item <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="item_name" placeholder="Item" required>
+                        </div>
+                    </div>
+
+                    <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>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <div class="col">
+
+                            <div class="form-group">
+                                <label>QTY <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" step="0.01" min="0" name="qty" value="1" required>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="col">
+
+                            <div class="form-group">
+                                <label>Price <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" step="0.01" min="0" name="price" value="0.00" required>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                    <div class="form-group">
+                        <label>Tax <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                            </div>
+                            <select class="form-control select2" name="tax_id" required>
+                                <option value="0">None</option>
+                                <?php
+
+                                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC");
+                                while ($row = mysqli_fetch_array($taxes_sql)) {
+                                    $tax_id_select = $row['tax_id'];
+                                    $tax_name = htmlentities($row['tax_name']);
+                                    $tax_percent = $row['tax_percent'];
+                                    ?>
+                                    <option <?php if ($tax_id_select == $tax_id) { echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+
+                                    <?php
+                                }
+                                ?>
+                            </select>
+
+                        </div>
+                    </div>
 
-              <div class="form-group">
-                <label>QTY <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
-                  </div>
-                  <input type="number" class="form-control" step="0.01" min="0" name="qty" value="1" required>
                 </div>
-              </div>
-
-            </div>
-
-            <div class="col">
-
-              <div class="form-group">
-                <label>Price <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                  </div>
-                  <input type="number" class="form-control" step="0.01" min="0" name="price" value="0.00" required>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_invoice_from_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Invoice</button>
                 </div>
-              </div>
-            
-            </div>
-          
-          </div>
-
-          <div class="form-group">
-            <label>Tax <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-              </div>
-              <select class="form-control select2" name="tax_id" required>
-                <option value="0">None</option>
-                <?php 
-                
-                $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
-                while ($row = mysqli_fetch_array($taxes_sql)) {
-                  $tax_id_select = $row['tax_id'];
-                  $tax_name = htmlentities($row['tax_name']);
-                  $tax_percent = $row['tax_percent'];
-                ?>
-                  <option <?php if ($tax_id_select == $tax_id) { echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              
-            </div>
-          </div>
-
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice_from_ticket" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create Invoice</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ticket_reply_edit_modal.php b/ticket_reply_edit_modal.php
index 72ded23a..1d9dd6fd 100644
--- a/ticket_reply_edit_modal.php
+++ b/ticket_reply_edit_modal.php
@@ -1,36 +1,36 @@
 <div class="modal" id="replyEditTicketModal<?php echo $ticket_reply_id; ?>" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-edit"></i> Editing Ticket Reply</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="ticket_reply_id" value="<?php echo $ticket_reply_id; ?>">
-        
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <textarea class="form-control summernote" rows="8" name="ticket_reply"><?php echo $ticket_reply; ?></textarea>
-          </div>
-
-          <?php if (!empty($ticket_reply_time_worked)) { ?>
-          <b>Time worked</b>
-          <div class="col-3">
-            <div class="form-group">
-              <input class="form-control timepicker" id="time_worked" name="time" type="time" step="1" value="<?php echo date_format($ticket_reply_time_worked, 'H:i:s') ?>"/>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-edit"></i> Editing Ticket Reply</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
-          <?php } ?>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_reply_id" value="<?php echo $ticket_reply_id; ?>">
 
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <textarea class="form-control summernote" rows="8" name="ticket_reply"><?php echo $ticket_reply; ?></textarea>
+                    </div>
+
+                    <?php if (!empty($ticket_reply_time_worked)) { ?>
+                        <b>Time worked</b>
+                        <div class="col-3">
+                            <div class="form-group">
+                                <input class="form-control timepicker" id="time_worked" name="time" type="time" step="1" value="<?php echo date_format($ticket_reply_time_worked, 'H:i:s') ?>"/>
+                            </div>
+                        </div>
+                    <?php } ?>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_ticket_reply" class="btn btn-primary">Save</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_ticket_reply" class="btn btn-primary">Save</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/user_add_modal.php b/user_add_modal.php
index 860f27b1..f65284d3 100644
--- a/user_add_modal.php
+++ b/user_add_modal.php
@@ -37,7 +37,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
               </div>
-              <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" required>
+              <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" required minlength="8">
               <div class="input-group-append">
                 <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
               </div>
@@ -55,15 +55,15 @@
               </div>
               <select class="form-control select2" name="default_company" required>
                 <option value="">- Company -</option>
-                <?php 
-                
-                $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC"); 
+                <?php
+
+                $sql_companies_select = mysqli_query($mysqli,"SELECT * FROM companies ORDER BY company_name ASC");
                 while ($row = mysqli_fetch_array($sql_companies_select)) {
                   $company_id = $row['company_id'];
                   $company_name = htmlentities($row['company_name']);
                 ?>
                   <option value="<?php echo $company_id; ?>"><?php echo $company_name; ?></option>
-                
+
                 <?php
                 }
                 ?>
@@ -108,4 +108,4 @@
       </form>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/user_profile.php b/user_profile.php
index e8245fbb..b1429b55 100644
--- a/user_profile.php
+++ b/user_profile.php
@@ -59,7 +59,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                             </div>
-                            <input type="password" class="form-control" data-toggle="password" name="new_password" placeholder="Leave blank for no change" autocomplete="new-password">
+                            <input type="password" class="form-control" data-toggle="password" name="new_password" placeholder="Leave blank for no change" autocomplete="new-password" minlength="8">
                             <div class="input-group-append">
                                 <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                             </div>
diff --git a/users.php b/users.php
index 9e3d6e8a..1b1f558e 100644
--- a/users.php
+++ b/users.php
@@ -29,7 +29,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>
+                        <!--<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
                     </div>
                 </div>
             </div>