diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 87446733..50d2d34b 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -397,7 +397,7 @@
 
                         <div class="tab-pane fade" id="pills-history<?php echo $asset_id; ?>">
 
-                            <?php $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history WHERE asset_history_asset_id = $asset_id");  ?>
+                            <?php $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history WHERE asset_history_asset_id = $asset_id ORDER BY asset_history_id DESC LIMIT 10");  ?>
 
                             <div class="form-group">
                                 <label>Asset History</label>
@@ -408,7 +408,7 @@
                                     while ($row = mysqli_fetch_array($sql_asset_history)) {
                                         $asset_history_description = nullable_htmlentities(($row['asset_history_description']));
                                         $asset_history_created_at = nullable_htmlentities(($row['asset_history_created_at']));
-                                        echo "<li>$asset_hisory_created_at - $asset_history_description</li>";
+                                        echo "<li><small class='text-secondary'>$asset_history_created_at</small><br>$asset_history_description</li>";
                                     }
                                     ?>
                                 </ul>
diff --git a/post/user/asset.php b/post/user/asset.php
index 4e587d78..5420b868 100644
--- a/post/user/asset.php
+++ b/post/user/asset.php
@@ -55,6 +55,9 @@ if (isset($_POST['add_asset'])) {
 
     }
 
+    // Add to History
+    mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = '$status', asset_history_description = '$session_name created $name', asset_history_asset_id = $asset_id");
+
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Create', log_description = '$session_name created asset $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $asset_id");
 
@@ -234,7 +237,10 @@ if (isset($_GET['delete_asset'])) {
     mysqli_query($mysqli,"DELETE FROM assets WHERE asset_id = $asset_id");
 
     // Delete Interfaces
-    mysqli_query($mysqli,"DELETE FROM asset_interfaces WHERE interface_asset_id = $asset_id"); 
+    mysqli_query($mysqli,"DELETE FROM asset_interfaces WHERE interface_asset_id = $asset_id");
+
+    // Delete History
+    mysqli_query($mysqli,"DELETE FROM asset_history WHERE asset_history_asset_id = $asset_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Delete', log_description = '$session_name deleted asset $asset_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $asset_id");