diff --git a/add_asset_modal.php b/add_asset_modal.php
index 9e46df5c..bb03f501 100644
--- a/add_asset_modal.php
+++ b/add_asset_modal.php
@@ -117,7 +117,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'];
@@ -141,7 +141,7 @@
                     <option value="">- Contact -</option>
                     <?php 
                     
-                    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
+                    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND client_id = $client_id ORDER BY contact_name ASC"); 
                     while($row = mysqli_fetch_array($sql)){
                       $contact_id = $row['contact_id'];
                       $contact_name = $row['contact_name'];
@@ -165,7 +165,7 @@
                     <option value="">- Network -</option>
                     <?php 
                     
-                    $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE client_id = $client_id ORDER BY network_name ASC"); 
+                    $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_archived_at IS NULL AND client_id = $client_id ORDER BY network_name ASC"); 
                     while($row = mysqli_fetch_array($sql)){
                       $network_id = $row['network_id'];
                       $network_name = $row['network_name'];
@@ -215,7 +215,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'];
diff --git a/add_location_modal.php b/add_location_modal.php
index cd35ffa7..98afbaa9 100644
--- a/add_location_modal.php
+++ b/add_location_modal.php
@@ -62,7 +62,7 @@
                     <option value="">- Contact -</option>
                     <?php 
                     
-                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND client_id = $client_id ORDER BY contact_name ASC"); 
                     while($row = mysqli_fetch_array($sql_vendors)){
                       $contact_id = $row['contact_id'];
                       $contact_name = $row['contact_name'];
diff --git a/client_contacts.php b/client_contacts.php
index a5991ed2..21847fdf 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -39,7 +39,7 @@ if(isset($_GET['o'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts WHERE client_id = $client_id AND (contact_name LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts WHERE contact_archived_at IS NULL AND (contact_name LIKE '%$q%') AND client_id = $client_id ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
@@ -95,6 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $contact_photo = $row['contact_photo'];
             $contact_initials = initials($contact_name);
             $contact_notes = $row['contact_notes'];
+            $contact_created_at = $row['contact_created_at'];           
       
           ?>
           <tr>
@@ -145,6 +146,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="post.php?archive_contact=<?php echo $contact_id; ?>">Archive</a>
                   <a class="dropdown-item" href="post.php?delete_contact=<?php echo $contact_id; ?>">Delete</a>
                 </div>
               </div> 
diff --git a/client_locations.php b/client_locations.php
index 0db8d266..8d0f3d8c 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -100,6 +100,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $location_photo = $row['location_photo'];
             $location_notes = $row['location_notes'];
             $location_primary = $row['location_primary'];
+            $location_created_at = $row['location_created_at'];
             $contact_id = $row['contact_id'];
       
           ?>
diff --git a/contacts.php b/contacts.php
index 5342b14b..a530edaa 100644
--- a/contacts.php
+++ b/contacts.php
@@ -146,11 +146,13 @@ $total_pages = ceil($total_found_rows / 10);
             
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">Edit</a>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="post.php?archive_contact=<?php echo $contact_id; ?>">Archive</a>
                   <a class="dropdown-item" href="post.php?delete_contact=<?php echo $contact_id; ?>">Delete</a>
                 </div>
               </div>
diff --git a/edit_location_modal.php b/edit_location_modal.php
index 84a5361f..b98a7421 100644
--- a/edit_location_modal.php
+++ b/edit_location_modal.php
@@ -64,7 +64,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 > '$location_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'];
diff --git a/post.php b/post.php
index fb5428be..5ba52ed7 100644
--- a/post.php
+++ b/post.php
@@ -3292,7 +3292,7 @@ if(isset($_POST['add_contact'])){
     mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_photo = '$path', contact_notes = '$notes', contact_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
 
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Create', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
 
     $_SESSION['alert_message'] = "Contact added";
     
@@ -3336,13 +3336,27 @@ if(isset($_POST['edit_contact'])){
 
 }
 
+if(isset($_GET['archive_contact'])){
+    $contact_id = intval($_GET['archive_contact']);
+
+    mysqli_query($mysqli,"UPDATE contacts SET contact_archived_at = NOW() WHERE contact_id = $contact_id");
+
+    //logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Archive', log_description = '$contact_id', log_created_at = NOW()");
+
+    $_SESSION['alert_message'] = "Contact Archived!";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['delete_contact'])){
     $contact_id = intval($_GET['delete_contact']);
 
     mysqli_query($mysqli,"DELETE FROM contacts WHERE contact_id = $contact_id AND company_id = $session_company_id");
 
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Deleted', log_description = '$contact_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Delete', log_description = '$contact_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
 
     $_SESSION['alert_message'] = "Contact deleted";