diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 6f9663a3..8df31684 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -1,158 +1,143 @@
 <div class="modal" id="addTicketModal" tabindex="-1">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> New Ticket</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body bg-white">
-          
-          <div class="form-group">
-            <label>Subject <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="subject" placeholder="Subject" required>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-life-ring"></i> New Ticket</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
-          </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Subject <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="subject" placeholder="Subject" required>
+                        </div>
+                    </div>
 
 
-          
-          <div class="form-group">
-            <textarea class="form-control summernote" rows="8" name="details"></textarea>
-          </div>
 
-          <div class="form-group">
-            <label>Priority <strong class="text-danger">*</strong></label>
-            <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="priority" required>
-                <option>Low</option>
-                <option>Medium</option>
-                <option>High</option>
-              </select>
-            </div>
-          </div>
+                    <div class="form-group">
+                        <textarea class="form-control summernote" rows="8" name="details"></textarea>
+                    </div>
 
-          <?php if(isset($_GET['client_id'])){ ?>
-            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-            <div class="form-group">
-            <label>Contact <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <select class="form-control select2" name="contact" required>
-                <option value="">- Contact -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $contact_id = $row['contact_id'];
-                  $contact_name = htmlentities($row['contact_name']);
-                ?>
-                  <option value="<?php echo $contact_id; ?>" <?php if($primary_contact == $contact_id){ echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          <?php }else{ ?>
-          <div class="form-group">
-            <label>Client <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <select class="form-control select2" name="client" required>
-                <option value="">- Client -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $client_id = $row['client_id'];
-                  $client_name = htmlentities($row['client_name']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          <?php } ?>
+                    <div class="form-group">
+                        <label>Priority <strong class="text-danger">*</strong></label>
+                        <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="priority" required>
+                                <option>Low</option>
+                                <option>Medium</option>
+                                <option>High</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <?php if (isset($_GET['client_id'])) { ?>
+                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                        <div class="form-group">
+                            <label>Contact <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                </div>
+                                <select class="form-control select2" name="contact" required>
+                                    <option value="">- Contact -</option>
+                                    <?php
+                                    $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $contact_id = $row['contact_id'];
+                                        $contact_name = htmlentities($row['contact_name']); ?>
+                                        <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
+
+                                        <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+                    <?php } else { ?>
+                        <div class="form-group">
+                            <label>Client <strong class="text-danger">*</strong></label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                </div>
+                                <select class="form-control select2" name="client" required>
+                                    <option value="">- Client -</option>
+                                    <?php
+
+                                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                                    while ($row = mysqli_fetch_array($sql)) {
+                                        $client_id = $row['client_id'];
+                                        $client_name = htmlentities($row['client_name']); ?>
+                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
+
+                                    <?php } ?>
+                                </select>
+                            </div>
+                        </div>
+                    <?php } ?>
+
+                    <?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
+
+                                    $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 = htmlentities($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>
+                    <?php } ?>
+
+                    <div class="form-group">
+                        <label>Assign to</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                            </div>
+                            <select class="form-control select2" name="assigned_to">
+                                <option value="0">Not Assigned</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
+                                  LEFT JOIN user_companies ON users.user_id = user_companies.user_id
+                                  LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                  WHERE user_companies.company_id = $session_company_id 
+                                  AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                );
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $user_id = $row['user_id'];
+                                    $user_name = htmlentities($row['user_name']); ?>
+                                    <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
 
-          <?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
-
-                  $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 = htmlentities($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>
-          <?php } ?>
-
-          <div class="form-group">
-            <label>Assign to</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-              </div>
-              <select class="form-control select2" name="assigned_to">
-                <option value="0">Not Assigned</option>
-                <?php 
-                
-                //$sql = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_archived_at IS NULL AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
-                $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
-                  LEFT JOIN user_companies ON users.user_id = user_companies.user_id
-                  LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                  WHERE user_companies.company_id = $session_company_id 
-                  AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                );
-                while($row = mysqli_fetch_array($sql)){
-                  $user_id = $row['user_id'];
-                  $user_name = htmlentities($row['user_name']);
-                ?>
-                <option <?php if($session_user_id == $user_id){ echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>    
-
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_ticket" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_ticket" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
\ No newline at end of file