diff --git a/agent/asset_details.php b/agent/asset_details.php
index 5da8b5e6..6b15bd2a 100644
--- a/agent/asset_details.php
+++ b/agent/asset_details.php
@@ -716,12 +716,12 @@ if (isset($_GET['asset_id'])) {
                                                         <i class="fas fa-fw fa-share-alt mr-2"></i>Share
                                                     </a>
                                                     <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item" href="post.php?unlink_credential_from_asset&asset_id=<?= $asset_id; ?>&credential_id=<?= $credential_id; ?>">
+                                                    <a class="dropdown-item" href="post.php?unlink_credential_from_asset&asset_id=<?= $asset_id; ?>&credential_id=<?= $credential_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
                                                         <i class="fas fa-fw fa-unlink mr-2"></i>Unlink
                                                     </a>
                                                     <?php if ($session_user_role == 3) { ?>
                                                         <div class="dropdown-divider"></div>
-                                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_credential=<?= $credential_id; ?>">
+                                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_credential=<?= $credential_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
                                                             <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                                         </a>
                                                     <?php } ?>
@@ -813,7 +813,7 @@ if (isset($_GET['asset_id'])) {
                                         <td><?= $software_license_type; ?></td>
                                         <td><?= "$seat_count / $software_seats"; ?></td>
                                         <td class="text-center">
-                                            <a href="post.php?unlink_software_from_asset&asset_id=<?= $asset_id; ?>&software_id=<?= $software_id; ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
+                                            <a href="post.php?unlink_software_from_asset&asset_id=<?= $asset_id; ?>&software_id=<?= $software_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
                                         </td>
                                     </tr>
 
@@ -879,7 +879,7 @@ if (isset($_GET['asset_id'])) {
                                                 data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
                                                 <i class="fas fa-fw fa-eye"></i>
                                             </a>
-                                            <a href="post.php?unlink_asset_from_document&asset_id=<?= $asset_id; ?>&document_id=<?= $document_id; ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
+                                            <a href="post.php?unlink_asset_from_document&asset_id=<?= $asset_id; ?>&document_id=<?= $document_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
                                         </td>
                                     </tr>
 
@@ -970,7 +970,7 @@ if (isset($_GET['asset_id'])) {
                                         <td><a class="text-dark" href="<?= "../uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" ><?= "$file_name<br><span class='text-secondary'>$file_description</span>"; ?></a></td>
                                         <td><?= $file_created_at; ?></td>
                                         <td class="text-center">
-                                            <a href="post.php?unlink_asset_from_file&asset_id=<?= $asset_id; ?>&file_id=<?= $file_id; ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
+                                            <a href="post.php?unlink_asset_from_file&asset_id=<?= $asset_id; ?>&file_id=<?= $file_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
                                         </td>
                                     </tr>
 
@@ -1193,7 +1193,7 @@ if (isset($_GET['asset_id'])) {
                                         <td><?= $service_category; ?></td>
                                         <td><?= $service_importance; ?></td>
                                         <td class="text-center">
-                                            <a href="post.php?unlink_service_from_asset&asset_id=<?= $asset_id; ?>&service_id=<?= $service_id; ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
+                                            <a href="post.php?unlink_service_from_asset&asset_id=<?= $asset_id; ?>&service_id=<?= $service_id; ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-secondary btn-sm" title="Unlink"><i class="fas fa-fw fa-unlink"></i></a>
                                         </td>
                                     </tr>
 
diff --git a/agent/assets.php b/agent/assets.php
index 5c95226e..a1b46543 100644
--- a/agent/assets.php
+++ b/agent/assets.php
@@ -402,8 +402,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <?php if ($archived) { ?>
                                     <div class="dropdown-divider"></div>
                                     <button class="dropdown-item text-info"
-                                        type="submit" form="bulkActions" name="bulk_unarchive_assets">
-                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                        type="submit" form="bulkActions" name="bulk_restore_assets">
+                                        <i class="fas fa-fw fa-redo mr-2"></i>Restore
                                     </button>
                                     <div class="dropdown-divider"></div>
                                     <button class="dropdown-item text-danger text-bold"
@@ -766,7 +766,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             </a>
                                             <?php if ($session_user_role > 2) { ?>
                                                 <?php if ($asset_archived_at) { ?>
-                                                <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                <a class="dropdown-item text-info" href="post.php?restore_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
                                                     <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
                                                 </a>
                                                 <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
diff --git a/agent/modals/asset/asset_link_credential.php b/agent/modals/asset/asset_link_credential.php
index d5163d7e..095f59d7 100644
--- a/agent/modals/asset/asset_link_credential.php
+++ b/agent/modals/asset/asset_link_credential.php
@@ -25,6 +25,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <div class="modal-body">
 
diff --git a/agent/modals/asset/asset_link_document.php b/agent/modals/asset/asset_link_document.php
index 9f36bfbb..50c8d287 100644
--- a/agent/modals/asset/asset_link_document.php
+++ b/agent/modals/asset/asset_link_document.php
@@ -25,6 +25,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <div class="modal-body">
 
diff --git a/agent/modals/asset/asset_link_file.php b/agent/modals/asset/asset_link_file.php
index 945057c0..7d4b744f 100644
--- a/agent/modals/asset/asset_link_file.php
+++ b/agent/modals/asset/asset_link_file.php
@@ -25,6 +25,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <div class="modal-body">
 
diff --git a/agent/modals/asset/asset_link_service.php b/agent/modals/asset/asset_link_service.php
index f100feab..a534de38 100644
--- a/agent/modals/asset/asset_link_service.php
+++ b/agent/modals/asset/asset_link_service.php
@@ -25,6 +25,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <div class="modal-body">
 
diff --git a/agent/modals/asset/asset_link_software.php b/agent/modals/asset/asset_link_software.php
index 402afc6d..6509170b 100644
--- a/agent/modals/asset/asset_link_software.php
+++ b/agent/modals/asset/asset_link_software.php
@@ -26,6 +26,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <div class="modal-body">
 
diff --git a/agent/post/asset.php b/agent/post/asset.php
index 06566915..eeb62ccc 100644
--- a/agent/post/asset.php
+++ b/agent/post/asset.php
@@ -166,13 +166,13 @@ if (isset($_GET['archive_asset'])) {
 
 }
 
-if (isset($_GET['unarchive_asset'])) {
+if (isset($_GET['restore_asset'])) {
 
     validateCSRFToken($_GET['csrf_token']);
 
     enforceUserPermission('module_support', 2);
 
-    $asset_id = intval($_GET['unarchive_asset']);
+    $asset_id = intval($_GET['restore_asset']);
 
     // Get Asset Name and Client ID for logging and alert message
     $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id");
@@ -183,11 +183,11 @@ if (isset($_GET['unarchive_asset'])) {
     mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NULL WHERE asset_id = $asset_id");
 
     // Add to History
-    mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = 'UnArchived', asset_history_description = '$session_name unarchived $asset_name', asset_history_asset_id = $asset_id");
+    mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = 'Restored', asset_history_description = '$session_name restored $asset_name', asset_history_asset_id = $asset_id");
 
-    logAction("Asset", "Unarchive", "$session_name unarchived asset $asset_name", $client_id, $asset_id);
+    logAction("Asset", "Restore", "$session_name restored asset $asset_name", $client_id, $asset_id);
 
-    flash_alert("Asset <strong>$asset_name</strong> Unarchived");
+    flash_alert("Asset <strong>$asset_name</strong> Restored");
 
     redirect();
 
@@ -219,6 +219,8 @@ if (isset($_GET['delete_asset'])) {
 
 if (isset($_POST['bulk_assign_asset_tags'])) {
 
+    validateCSRFToken($_POST['csrf_token']);
+
     enforceUserPermission('module_client', 2);
 
     if (isset($_POST['asset_ids'])) {
@@ -622,7 +624,7 @@ if (isset($_POST['bulk_archive_assets'])) {
 
 }
 
-if (isset($_POST['bulk_unarchive_assets'])) {
+if (isset($_POST['bulk_restore_assets'])) {
 
     validateCSRFToken($_POST['csrf_token']);
 
@@ -645,16 +647,16 @@ if (isset($_POST['bulk_unarchive_assets'])) {
             mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NULL WHERE asset_id = $asset_id");
 
             // Individual Asset logging
-            logAction("Asset", "Unarchive", "$session_name unarchived asset $asset_name", $client_id, $asset_id);
+            logAction("Asset", "Restore", "$session_name restored asset $asset_name", $client_id, $asset_id);
 
             // Add to History
-            mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = 'UnArchived', asset_history_description = '$session_name unarchived $asset_name', asset_history_asset_id = $asset_id");
+            mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = 'Restored', asset_history_description = '$session_name restored $asset_name', asset_history_asset_id = $asset_id");
 
         }
 
-        logAction("Asset", "Bulk Unarchive", "$session_name unarchived $count assets");
+        logAction("Asset", "Bulk Restore", "$session_name restored $count assets");
 
-        flash_alert("Unarchived $count asset(s)");
+        flash_alert("Restored $count asset(s)");
 
     }
 
@@ -700,6 +702,8 @@ if (isset($_POST['bulk_delete_assets'])) {
 
 if (isset($_POST['link_software_to_asset'])) {
 
+    validateCSRFToken($_POST['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $software_id = intval($_POST['software_id']);
@@ -726,6 +730,8 @@ if (isset($_POST['link_software_to_asset'])) {
 
 if (isset($_GET['unlink_software_from_asset'])) {
 
+    validateCSRFToken($_GET['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $asset_id = intval($_GET['asset_id']);
@@ -753,6 +759,8 @@ if (isset($_GET['unlink_software_from_asset'])) {
 // Right now 1 login and have many assets but not many to many
 if (isset($_POST['link_asset_to_credential'])) {
 
+    validateCSRFToken($_POST['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $credential_id = intval($_POST['credential_id']);
@@ -779,6 +787,8 @@ if (isset($_POST['link_asset_to_credential'])) {
 
 if (isset($_GET['unlink_credential_from_asset'])) {
 
+    validateCSRFToken($_GET['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $asset_id = intval($_GET['asset_id']);
@@ -805,6 +815,8 @@ if (isset($_GET['unlink_credential_from_asset'])) {
 
 if (isset($_POST['link_service_to_asset'])) {
 
+    validateCSRFToken($_POST['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $service_id = intval($_POST['service_id']);
@@ -831,6 +843,8 @@ if (isset($_POST['link_service_to_asset'])) {
 
 if (isset($_GET['unlink_service_from_asset'])) {
 
+    validateCSRFToken($_GET['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $asset_id = intval($_GET['asset_id']);
@@ -857,6 +871,8 @@ if (isset($_GET['unlink_service_from_asset'])) {
 
 if (isset($_POST['link_asset_to_file'])) {
 
+    validateCSRFToken($_POST['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $file_id = intval($_POST['file_id']);
@@ -884,6 +900,8 @@ if (isset($_POST['link_asset_to_file'])) {
 
 if (isset($_GET['unlink_asset_from_file'])) {
 
+    validateCSRFToken($_GET['csrf_token']);
+
     enforceUserPermission('module_support', 2);
 
     $asset_id = intval($_GET['asset_id']);
@@ -1371,9 +1389,10 @@ if (isset($_POST['edit_asset_interface'])) {
 
 if (isset($_GET['delete_asset_interface'])) {
 
-    enforceUserPermission('module_support', 2);
     validateCSRFToken($_GET['csrf_token']);
 
+    enforceUserPermission('module_support', 2);
+
     $interface_id = intval($_GET['delete_asset_interface']);
 
     // 1) Fetch details for logging / alerts