diff --git a/ajax/ajax_software_edit.php b/ajax/ajax_software_edit.php
index d9a06b1d..6ff86d04 100644
--- a/ajax/ajax_software_edit.php
+++ b/ajax/ajax_software_edit.php
@@ -18,6 +18,7 @@ $software_purchase = nullable_htmlentities($row['software_purchase']);
 $software_expire = nullable_htmlentities($row['software_expire']);
 $software_notes = nullable_htmlentities($row['software_notes']);
 $software_created_at = nullable_htmlentities($row['software_created_at']);
+$software_vendor_id = intval($row['software_vendor_id']);
 $client_id = intval($row['software_client_id']);
 $seat_count = 0;
 
@@ -107,6 +108,28 @@ ob_start();
                     </div>
                 </div>
 
+                <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="">- Select Vendor -</option>
+                            <?php
+                            $vendor_sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                                while ($row = mysqli_fetch_array($vendor_sql)) {
+                                    $vendor_id = $row['vendor_id'];
+                                    $vendor_name = $row['vendor_name'];
+                                ?>
+                                <option <?php if ($software_vendor_id == $vendor_id) { echo "selected"; } ?> value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                            <?php 
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Type <strong class="text-danger">*</strong></label>
                     <div class="input-group">
diff --git a/modals/software_add_modal.php b/modals/software_add_modal.php
index 8dc810c2..fe44580f 100644
--- a/modals/software_add_modal.php
+++ b/modals/software_add_modal.php
@@ -93,6 +93,29 @@
                                 </div>
                             </div>
 
+                            <?php if ($client_url) { ?>
+                            <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="">- Select Vendor -</option>
+                                        <?php
+
+                                        $sql = mysqli_query($mysqli, "SELECT vendor_name, vendor_id FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $vendor_id = intval($row['vendor_id']);
+                                            $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                            ?>
+                                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Type <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
@@ -100,7 +123,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                                     </div>
                                     <select class="form-control select2" name="type" required>
-                                        <option value="">- Type -</option>
+                                        <option value="">- Select Type -</option>
                                         <?php foreach ($software_types_array as $software_type) { ?>
                                             <option><?php echo $software_type; ?></option>
                                         <?php } ?>
diff --git a/post/user/software.php b/post/user/software.php
index f12aa63c..7e63ff65 100644
--- a/post/user/software.php
+++ b/post/user/software.php
@@ -23,9 +23,10 @@ if (isset($_POST['add_software_from_template'])) {
     $type = sanitizeInput($row['software_type']);
     $license_type = sanitizeInput($row['software_license_type']);
     $notes = sanitizeInput($row['software_notes']);
+    $vendor = sanitizeInput($_POST['vendor'] ?? 0);
 
     // Software add query
-    mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_vendor_id = $vendor, software_client_id = $client_id");
 
     $software_id = mysqli_insert_id($mysqli);
 
@@ -64,8 +65,9 @@ if (isset($_POST['add_software'])) {
         $expire = "'" . $expire . "'";
     }
     $notes = sanitizeInput($_POST['notes']);
+    $vendor = sanitizeInput($_POST['vendor'] ?? 0);
 
-    mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_vendor_id = $vendor, software_client_id = $client_id");
 
     $software_id = mysqli_insert_id($mysqli);
 
@@ -123,8 +125,9 @@ if (isset($_POST['edit_software'])) {
         $expire = "'" . $expire . "'";
     }
     $notes = sanitizeInput($_POST['notes']);
+    $vendor = sanitizeInput($_POST['vendor'] ?? 0);
 
-    mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes' WHERE software_id = $software_id");
+    mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_vendor_id = $vendor WHERE software_id = $software_id");
 
 
     // Update Asset Licenses