diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 9482f141..93f47828 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -155,7 +155,7 @@
                                         $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id 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']); ?>
+                                            $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 } ?>
@@ -164,31 +164,7 @@
                             </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="">- None -</option>
-                                        <?php
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $vendor_id = $row['vendor_id'];
-                                            $vendor_name = htmlentities($row['vendor_name']); ?>
-                                            <option value="<?php echo $vendor_id; ?>" <?php if ($primary_contact == $vendor_id) { echo "selected"; } ?>><?php echo "$vendor_name"; ?></option>
-
-                                            <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
+                        
                         <?php } ?>
 
                     </div>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 6c04afac..1b381c63 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -49,14 +49,14 @@
                             <div class="form-group">
                                 <label>Priority <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-thermometer-half"></i></span>
-                                  </div>
-                                  <select class="form-control select2" name="priority" required>
-                                    <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
-                                    <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
-                                    <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
-                                  </select>
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="priority" required>
+                                        <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
+                                        <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
+                                        <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
+                                    </select>
                                 </div>
                             </div>
                     
@@ -67,27 +67,26 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                                     </div>
                                     <select class="form-control select2" name="assigned_to">
-                                    <option value="0">Not Assigned</option>
-                                    <?php 
+                                        <option value="0">Not Assigned</option>
+                                        <?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
-                                      LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                      WHERE user_companies.company_id = $session_company_id 
-                                      AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                                    );
-                                    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>
+                                        $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
+                                            LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                            WHERE user_companies.company_id = $session_company_id 
+                                            AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                        );
+                                        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>
 
-                                    <?php
-                                    }
-                                    ?>
+                                        <?php
+                                        }
+                                        ?>
                                     </select>
                                 </div>
-            
                             </div>
 
                         </div>
@@ -97,24 +96,24 @@
                             <div class="form-group">
                                 <label>Client Contact</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">
-                                    <option value="">No One</option>
-                                    <?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
-                                    }
-                                    ?>
-                                  </select>
+                                    <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">
+                                        <option value="">No One</option>
+                                        <?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
+                                        }
+                                        ?>
+                                    </select>
                                 </div>
                             </div>
 
@@ -125,24 +124,24 @@
                             <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
+                                    <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 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']);
+                                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id 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 <?php if (!empty($asset_id) && $asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                            <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
-                                    }
-                                    ?>
-                                  </select>
+                                        <?php
+                                        }
+                                        ?>
+                                    </select>
                                 </div>
                             </div>
 
@@ -153,24 +152,24 @@
                             <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
+                                    <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 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']);
+                                          $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_client_id = $client_id 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
+                                        }
                                         ?>
-                                        <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
-                                    }
-                                    ?>
-                                  </select>
+                                    </select>
                                 </div>
                             </div>