diff --git a/add_domain_modal.php b/add_domain_modal.php
index e7b3dd52..4ce360b3 100644
--- a/add_domain_modal.php
+++ b/add_domain_modal.php
@@ -31,7 +31,7 @@
                 <option value="">- Vendor -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id ORDER BY vendor_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND client_id = $client_id ORDER BY vendor_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $vendor_id = $row['vendor_id'];
                   $vendor_name = $row['vendor_name'];
@@ -55,7 +55,7 @@
                 <option value="">- Vendor -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id ORDER BY vendor_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at NULL AND client_id = $client_id ORDER BY vendor_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $vendor_id = $row['vendor_id'];
                   $vendor_name = $row['vendor_name'];
diff --git a/add_network_modal.php b/add_network_modal.php
index 351dbd00..d5d15241 100644
--- a/add_network_modal.php
+++ b/add_network_modal.php
@@ -71,7 +71,7 @@
                 <option value="">- Location -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE client_id = $client_id ORDER BY location_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND client_id = $client_id ORDER BY location_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $location_id = $row['location_id'];
                   $location_name = $row['location_name'];
diff --git a/client.php b/client.php
index 9ef5fcd6..4e9f745b 100644
--- a/client.php
+++ b/client.php
@@ -55,58 +55,58 @@ if(isset($_GET['client_id'])){
 
   //Badge Counts
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND client_id = $client_id"));
   $num_contacts = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND client_id = $client_id"));
   $num_locations = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND client_id = $client_id"));
   $num_assets = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND client_id = $client_id"));
   $num_tickets = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND client_id = $client_id"));
   $num_vendors = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND client_id = $client_id"));
   $num_logins = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('network_id') AS num FROM networks WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND client_id = $client_id"));
   $num_networks = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND client_id = $client_id"));
   $num_domains = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND client_id = $client_id"));
   $num_certificates = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND client_id = $client_id"));
   $num_software = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND client_id = $client_id"));
   $num_invoices = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND client_id = $client_id"));
   $num_quotes = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND client_id = $client_id"));
   $num_recurring = $row['num'];
 
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payments.invoice_id = invoices.invoice_id AND invoices.client_id = $client_id"));
   $num_payments = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files WHERE file_archved_at IS NULL AND client_id = $client_id"));
   $num_files = $row['num'];
   
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND client_id = $client_id"));
   $num_documents = $row['num'];
 
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('event_id') AS num FROM events WHERE client_id = $client_id"));
   $num_events = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips WHERE client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND client_id = $client_id"));
   $num_trips = $row['num'];
 
 ?>
diff --git a/client_assets.php b/client_assets.php
index e772593c..c8649579 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -97,6 +97,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $asset_purchase_date = $row['asset_purchase_date'];
             $asset_warranty_expire = $row['asset_warranty_expire'];
             $asset_notes = $row['asset_notes'];
+            $asset_created_at = $row['asset_created_at'];
             $vendor_id = $row['vendor_id'];
             $location_id = $row['location_id'];
             $contact_id = $row['contact_id'];
diff --git a/client_networks.php b/client_networks.php
index b2e9c395..1ccaa0a6 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -89,6 +89,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $network = $row['network'];
             $network_gateway = $row['network_gateway'];
             $network_dhcp_range = $row['network_dhcp_range'];
+            $network_created_at = $row['network_created_at'];
             $location_id = $row['location_id'];
       
           ?>
diff --git a/domains.php b/domains.php
index 7878a34a..bbe8ed55 100644
--- a/domains.php
+++ b/domains.php
@@ -87,6 +87,7 @@ $total_pages = ceil($total_found_rows / 10);
             $domain_registrar = $row['domain_registrar'];
             $domain_webhost = $row['domain_webhost'];
             $domain_expire = $row['domain_expire'];
+            $domain_created_at = $row['domain_created_at'];
             $client_id = $row['client_id'];
             $client_name = $row['client_name'];
 
diff --git a/edit_asset_modal.php b/edit_asset_modal.php
index 0a43fc90..d02833fb 100644
--- a/edit_asset_modal.php
+++ b/edit_asset_modal.php
@@ -140,7 +140,7 @@
                     <option value="">- Contact -</option>
                     <?php 
                     
-                    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
+                    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE (contact_archived_at > '$asset_created_at' OR contact_archived_at IS NULL) AND client_id = $client_id ORDER BY contact_name ASC"); 
                     while($row = mysqli_fetch_array($sql_contacts)){
                       $contact_id_select = $row['contact_id'];
                       $contact_name_select = $row['contact_name'];
@@ -164,7 +164,7 @@
                     <option value="">- Network -</option>
                     <?php 
                     
-                    $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE client_id = $client_id ORDER BY network_name ASC"); 
+                    $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND client_id = $client_id ORDER BY network_name ASC"); 
                     while($row = mysqli_fetch_array($sql_networks)){
                       $network_id_select = $row['network_id'];
                       $network_name_select = $row['network_name'];
@@ -214,7 +214,7 @@
                     <option value="">- Vendor -</option>
                     <?php 
                     
-                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id ORDER BY vendor_name ASC"); 
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND 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 = $row['vendor_name'];
diff --git a/edit_network_modal.php b/edit_network_modal.php
index a31857df..918f7261 100644
--- a/edit_network_modal.php
+++ b/edit_network_modal.php
@@ -71,7 +71,7 @@
                 <option value="">- Location -</option>
                 <?php 
                 
-                $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE client_id = $client_id ORDER BY location_name ASC"); 
+                $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE (location_archived_at > '$network_created_at' OR location_archived_at IS NULL) AND client_id = $client_id ORDER BY location_name ASC"); 
                 while($row = mysqli_fetch_array($sql_locations)){
                   $location_id_select = $row['location_id'];
                   $location_name_select = $row['location_name'];