diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index 62ed47ea..098d67c3 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -84,9 +84,19 @@
               <input type="text" class="form-control" name="subject" placeholder="Subject" required>
             </div>
           </div>
+
+          <?php if(!empty($config_smtp_host)){ ?>
+
+          <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 $client_email; ?></span></label>
+            </div>
+          </div>
+
+          <?php } ?>
           
           <div class="form-group">
-            <label>Details <strong class="text-danger">*</strong></label>
             <textarea class="form-control summernote" rows="8" name="details"></textarea>
           </div>
 
diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index 0602e65a..1b584592 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -59,8 +59,18 @@
             </div>
           </div>
           
+          <?php if(!empty($config_smtp_host) AND !empty($client_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 $client_email; ?></span></label>
+            </div>
+          </div>
+
+          <?php } ?>
+
           <div class="form-group">
-            <label>Details <strong class="text-danger">*</strong></label>
             <textarea class="form-control summernote" rows="8" name="details" required><?php echo $ticket_details; ?></textarea>
           </div>
 
diff --git a/ticket.php b/ticket.php
index 68bf557e..7d28e940 100644
--- a/ticket.php
+++ b/ticket.php
@@ -123,8 +123,42 @@ if(isset($_GET['ticket_id'])){
       <div class="form-group">
         <textarea class="form-control summernote" name="ticket_update"></textarea>
       </div>
-      <button type="submit" name="add_ticket_update" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Save</button>
-       
+      <div class="form-row">
+        <div class="col-md-3">
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+              </div>
+              <select class="form-control select2" name="status" required>
+                <option <?php if($ticket_stataus == 'Open'){ echo "selected"; } ?> >Open</option>
+                <option <?php if($ticket_stataus == 'Working'){ echo "selected"; } ?> >Working</option>
+                <option <?php if($ticket_status == 'On Hold'){ echo "selected"; } ?> >On Hold</option>
+                <option <?php if($ticket_status == 'Closed'){ echo "selected"; } ?> >Closed</option>
+              </select>
+            </div>
+          </div>
+        </div>
+
+        <?php if(!empty($config_smtp_host) AND !empty($client_email)){ ?>
+
+        <div class="col-md-2">
+          <div class="form-group">
+            <div class="custom-control custom-checkbox">
+              <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_ticket_update" value="1" checked>
+              <label class="custom-control-label" for="customControlAutosizing">Email update to client</label>
+            </div>
+          </div>
+        </div>
+
+        <?php } ?>
+        
+        <div class="col-md-1">
+          <button type="submit" name="add_ticket_update" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Save</button>
+        </div>
+
+      </div>
+    
     </form>
 
     <?php