diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index 156469de..f80571e2 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -108,15 +108,30 @@
             </div>
           </div>
 
-          <?php if(!empty($config_smtp_host)){ ?>
+          <?php if(isset($_GET['client_id'])){ ?>
+            <div class="form-group">
+                <label>Asset</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                    </div>
+                    <select class="form-control select2" name="asset">
+                        <option value="0">- None -</option>
+                        <?php
 
-          <div class="form-group">
-            <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_ticket_updates" value="1" checked>
-              <label class="custom-control-label" for="customControlAutosizing">Email ticket updates <span class="text-secondary"><?php echo $contact_email; ?></span></label>
+                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                        while($row = mysqli_fetch_array($sql_assets)){
+                            $asset_id_select = $row['asset_id'];
+                            $asset_name_select = $row['asset_name'];
+                            ?>
+                            <option <?php if(!empty($asset_id) && $asset_id == $asset_id_select){ echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
             </div>
-          </div>
-
           <?php } ?>
           
           <div class="form-group">
diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index cf3b8463..e18ffa8f 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -58,17 +58,6 @@
               <input type="text" class="form-control" name="subject" value="<?php echo $ticket_subject; ?>" placeholder="Subject" required>
             </div>
           </div>
-          
-          <?php if(!empty($config_smtp_host) AND !empty($contact_email)){ ?>
-
-          <div class="form-group">
-            <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_ticket_updates" value="1" checked>
-              <label class="custom-control-label" for="customControlAutosizing">Email ticket updates <span class="text-secondary"><?php echo $contact_email; ?></span></label>
-            </div>
-          </div>
-
-          <?php } ?>
 
           <div class="form-group">
             <label>Client Contact</label>
diff --git a/post.php b/post.php
index 53f2dcd1..df7f0c08 100644
--- a/post.php
+++ b/post.php
@@ -5047,6 +5047,7 @@ if(isset($_POST['add_ticket'])){
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
+    $asset_id = intval($_POST['asset']);
 
     if($client_id > 0 AND $contact == 0){
         $sql = mysqli_query($mysqli,"SELECT primary_contact FROM clients WHERE client_id = $client_id AND company_id = $session_company_id");
@@ -5059,7 +5060,7 @@ if(isset($_POST['add_ticket'])){
     $new_config_ticket_next_number = $config_ticket_next_number + 1;
     mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = $session_company_id");
 
-    mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_at = NOW(), ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_asset_id = $asset_id, ticket_created_at = NOW(), ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = '$session_name created ticket $subject', log_created_at = NOW(), log_client_id = $client_id, company_id = $session_company_id, log_user_id = $session_user_id");