diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php
index 1bbd9b29..8cdf0782 100644
--- a/ajax/ajax_credential_edit.php
+++ b/ajax/ajax_credential_edit.php
@@ -21,9 +21,7 @@ $login_created_at = nullable_htmlentities($row['login_created_at']);
 $login_archived_at = nullable_htmlentities($row['login_archived_at']);
 $login_important = intval($row['login_important']);
 $login_contact_id = intval($row['login_contact_id']);
-$login_vendor_id = intval($row['login_vendor_id']);
 $login_asset_id = intval($row['login_asset_id']);
-$login_software_id = intval($row['login_software_id']);
 
 // Tags
 $login_tag_id_array = array();
@@ -189,28 +187,6 @@ 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="0">- None -</option>
-                            <?php
-
-                            $sql_vendors = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                            while ($row = mysqli_fetch_array($sql_vendors)) {
-                                $vendor_id_select = intval($row['vendor_id']);
-                                $vendor_name_select = nullable_htmlentities($row['vendor_name']);
-                                ?>
-                                <option <?php if ($login_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Asset</label>
                     <div class="input-group">
@@ -240,28 +216,6 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Software</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>
-                        <select class="form-control select2" name="software">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql_software = mysqli_query($mysqli, "SELECT software_id, software_name FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
-                            while ($row = mysqli_fetch_array($sql_software)) {
-                                $software_id_select = intval($row['software_id']);
-                                $software_name_select = nullable_htmlentities($row['software_name']);
-                                ?>
-                                <option <?php if ($login_software_id == $software_id_select) { echo "selected"; } ?> value="<?php echo $software_id_select; ?>"><?php echo $software_name_select; ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
             </div>
 
             <div class="tab-pane fade" id="pills-login-notes<?php echo $login_id; ?>">
diff --git a/credentials.php b/credentials.php
index 04a8692f..ee365fca 100644
--- a/credentials.php
+++ b/credentials.php
@@ -293,9 +293,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $login_archived_at = nullable_htmlentities($row['login_archived_at']);
                             $login_important = intval($row['login_important']);
                             $login_contact_id = intval($row['login_contact_id']);
-                            $login_vendor_id = intval($row['login_vendor_id']);
                             $login_asset_id = intval($row['login_asset_id']);
-                            $login_software_id = intval($row['login_software_id']);
 
                             // Tags
                             $login_tag_name_display_array = array();
diff --git a/database_updates.php b/database_updates.php
index de2b81ad..192800e7 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -2505,10 +2505,22 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.4'");
     }
 
-    // if (CURRENT_DATABASE_VERSION == '1.8.4') {
-    //     // Insert queries here required to update to DB version 1.8.5
+    if (CURRENT_DATABASE_VERSION == '1.8.4') {
+        mysqli_query($mysqli, "ALTER TABLE `logins` DROP `login_software_id`");
+        mysqli_query($mysqli, "ALTER TABLE `logins` DROP `login_vendor_id`");
+        mysqli_query($mysqli, "ALTER TABLE `software` DROP `software_login_id`");
+        mysqli_query($mysqli, "ALTER TABLE `software` ADD `software_vendor_id` INT(11) DEFAULT 0 AFTER `software_accessed_at`");
+
+
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.5'");
+        
+
+    }
+
+    // if (CURRENT_DATABASE_VERSION == '1.8.5') {
+    //     // Insert queries here required to update to DB version 1.8.6
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.5'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.6'");
     // }
 
 } else {
diff --git a/db.sql b/db.sql
index 15f49327..0849fbd2 100644
--- a/db.sql
+++ b/db.sql
@@ -1033,9 +1033,7 @@ CREATE TABLE `logins` (
   `login_password_changed_at` datetime DEFAULT current_timestamp(),
   `login_folder_id` int(11) NOT NULL DEFAULT 0,
   `login_contact_id` int(11) NOT NULL DEFAULT 0,
-  `login_vendor_id` int(11) NOT NULL DEFAULT 0,
   `login_asset_id` int(11) NOT NULL DEFAULT 0,
-  `login_software_id` int(11) NOT NULL DEFAULT 0,
   `login_client_id` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`login_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
@@ -1813,7 +1811,7 @@ CREATE TABLE `software` (
   `software_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
   `software_archived_at` datetime DEFAULT NULL,
   `software_accessed_at` datetime DEFAULT NULL,
-  `software_login_id` int(11) NOT NULL DEFAULT 0,
+  `software_vendor_id` int(11) DEFAULT 0,
   `software_client_id` int(11) NOT NULL,
   `software_template_id` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`software_id`)
@@ -2363,4 +2361,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-02-18 17:21:45
+-- Dump completed on 2025-02-24 21:23:33
diff --git a/includes/database_version.php b/includes/database_version.php
index 40929937..7889e3ff 100644
--- a/includes/database_version.php
+++ b/includes/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "1.8.4");
+DEFINE("LATEST_DATABASE_VERSION", "1.8.5");
diff --git a/modals/credential_add_modal.php b/modals/credential_add_modal.php
index e9a64b93..1d33905b 100644
--- a/modals/credential_add_modal.php
+++ b/modals/credential_add_modal.php
@@ -171,30 +171,6 @@
                                 </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="">- Vendor -</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 = 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>
-
                             <div class="form-group">
                                 <label>Asset</label>
                                 <div class="input-group">
@@ -225,31 +201,6 @@
                                     </select>
                                 </div>
                             </div>
-
-                            <div class="form-group">
-                                <label>Software</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>
-                                    <select class="form-control select2" name="software">
-                                        <option value="">- Software -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $software_id = intval($row['software_id']);
-                                            $software_name = nullable_htmlentities($row['software_name']);
-                                            ?>
-                                            <option value="<?php echo $software_id; ?>"><?php echo $software_name; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
                         </div>
                         <?php } ?>
 
diff --git a/post/user/credential_model.php b/post/user/credential_model.php
index 48c7adf0..6ab57b48 100644
--- a/post/user/credential_model.php
+++ b/post/user/credential_model.php
@@ -13,6 +13,4 @@ $otp_secret = sanitizeInput($_POST['otp_secret']);
 $note = sanitizeInput($_POST['note']);
 $important = intval($_POST['important'] ?? 0);
 $contact_id = intval($_POST['contact'] ?? 0);
-$vendor_id = intval($_POST['vendor'] ?? 0);
 $asset_id = intval($_POST['asset'] ?? 0);
-$software_id = intval($_POST['software'] ?? 0);