diff --git a/client_add_modal.php b/client_add_modal.php
index cb99bea9..8a4491dd 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -305,7 +305,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="tags[]" data-tags="true" data-placeholder="Add some tags" multiple>
+                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
                                         <?php
 
                                         $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
diff --git a/client_edit_modal.php b/client_edit_modal.php
index 66b535a8..1b253698 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -200,7 +200,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="tags[]" data-tags="true" data-placeholder="Add some tags" multiple>
+                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
                                         <?php
 
                                         $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 618db36d..f6c2d37c 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -169,8 +169,22 @@
 
                                 <div class="form-group">
                                     <label>Watchers</label>
-                                    <div class="watchers"></div>
-                                    <button type="button" class="btn btn-primary" onclick="addWatcher(this)"><i class="fas fa-fw fa-plus"></i> Add Watcher</button>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                                        </div>
+                                        <select class="form-control select2" name="watchers[]" data-tags="true" data-placeholder="Enter or select email address" multiple>
+                                            <option value="">aa</option>
+                                            <?php
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL AND contact_email IS NOT NULL ORDER BY contact_email ASC");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $contact_email = nullable_htmlentities($row['contact_email']);
+                                                ?>
+                                                <option><?php echo $contact_email; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                    </div>
                                 </div>
 
                             </div>