diff --git a/post.php b/post.php
index 51621d29..f0917611 100644
--- a/post.php
+++ b/post.php
@@ -6181,8 +6181,10 @@ if(isset($_POST['add_ticket'])){
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($_POST['details']))));
+    $vendor_id = intval($_POST['vendor']);
     $asset_id = intval($_POST['asset']);
 
+    // If no contact is selected automatically choose the primary contact for the client
     if($client_id > 0 && $contact == 0){
         $sql = mysqli_query($mysqli,"SELECT primary_contact FROM clients WHERE client_id = $client_id AND company_id = $session_company_id");
         $row = mysqli_fetch_array($sql);
@@ -6194,7 +6196,7 @@ if(isset($_POST['add_ticket'])){
     $new_config_ticket_next_number = $config_ticket_next_number + 1;
     mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = $session_company_id");
 
-    mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_vendor_id = $vendor_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, company_id = $session_company_id");
     $id = mysqli_insert_id($mysqli);
 
     // E-mail client
@@ -6349,9 +6351,10 @@ if(isset($_POST['edit_ticket'])){
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($_POST['details']))));
+    $vendor_id = intval($_POST['vendor']);
     $asset_id = intval($_POST['asset']);
 
-    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
diff --git a/ticket.php b/ticket.php
index b2b8dc31..ec7749a2 100644
--- a/ticket.php
+++ b/ticket.php
@@ -9,6 +9,7 @@ if (isset($_GET['ticket_id'])) {
         LEFT JOIN users ON ticket_assigned_to = user_id 
         LEFT JOIN locations ON ticket_location_id = location_id
         LEFT JOIN assets ON ticket_asset_id = asset_id
+        LEFT JOIN vendors ON ticket_vendor_id = vendor_id
         WHERE ticket_id = $ticket_id AND tickets.company_id = $session_company_id"
     );
 
@@ -80,6 +81,20 @@ if (isset($_GET['ticket_id'])) {
         $asset_os = htmlentities($row['asset_os']);
         $asset_warranty_expire = $row['asset_warranty_expire'];
 
+        $vendor_id = $row['ticket_vendor_id'];
+        $vendor_name = htmlentities($row['vendor_name']);
+        $vendor_description = htmlentities($row['vendor_description']);
+        $vendor_account_number = htmlentities($row['vendor_account_number']);
+        $vendor_contact_name = htmlentities($row['vendor_contact_name']);
+        $vendor_phone = formatPhoneNumber($row['vendor_phone']);
+        $vendor_extension = htmlentities($row['vendor_extension']);
+        $vendor_email = htmlentities($row['vendor_email']);
+        $vendor_website = htmlentities($row['vendor_website']);
+        $vendor_hours = htmlentities($row['vendor_hours']);
+        $vendor_sla = htmlentities($row['vendor_sla']);
+        $vendor_code = htmlentities($row['vendor_code']);
+        $vendor_notes = htmlentities($row['vendor_notes']);
+
         $location_name = htmlentities($row['location_name']);
         $location_address = htmlentities($row['location_address']);
         $location_city = htmlentities($row['location_city']);
@@ -527,6 +542,39 @@ if (isset($_GET['ticket_id'])) {
                     </div>
                 <?php } ?>
 
+                <!-- Vendor card -->
+                <?php if (!empty($vendor_id)) { ?>
+                    <div class="card card-body card-outline card-dark mb-3">
+                        <div>
+                            <h4 class="text-secondary">Vendor</h4>
+                            <i class="fa fa-fw fa-building text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $vendor_name; ?></strong>
+                            <?php
+
+                            if (!empty($vendor_contact_name)) { ?>
+                                <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i><?php echo $vendor_contact_name; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_email)) { ?>
+                                <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i><a href="mailto:<?php echo $vendor_email; ?>"><?php echo $vendor_email; ?></a>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_phone)) { ?>
+                                <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $vendor_phone; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_website)) { ?>
+                                <i class="fa fa-fw fa-globe text-secondary ml-1 mr-2 mb-2"></i><?php echo $vendor_website; ?>
+                                <br>
+                            <?php } ?>
+
+                        </div>
+                    </div>
+
+                <?php } ?>
+
                 <form action="post.php" method="post">
                     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
                     <div class="form-group">
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 93f47828..85a0a6aa 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -128,7 +128,7 @@
                                     <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 ORDER BY contact_name ASC");
+                                        $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']); ?>
@@ -152,11 +152,36 @@
                                         <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");
+                                        $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 <?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 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="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>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 1b381c63..5c7f4821 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -159,7 +159,7 @@
                                         <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");
+                                          $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']);