diff --git a/.github/workflows/dbsql-lint.yml b/.github/workflows/dbsql-lint.yml
new file mode 100644
index 000000000..d190fd300
--- /dev/null
+++ b/.github/workflows/dbsql-lint.yml
@@ -0,0 +1,37 @@
+name: SQL Syntax Check for db.sql
+
+on:
+  pull_request:
+    paths:
+      - 'db.sql'
+
+jobs:
+  syntax_check:
+    name: Check db.sql SQL Syntax
+    runs-on: ubuntu-latest
+
+    services:
+      mariadb:
+        image: mariadb:latest
+        ports:
+        - "3306:3306"
+        env:
+          MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+          MARIADB_USER: user
+          MARIADB_PASSWORD: password
+          MARIADB_DATABASE: itfsyntaxdb
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Import & Lint db.sql
+        run: mysql --host 127.0.0.1 -uuser -ppassword itfsyntaxdb < db.sql
+
+      - name: Show imported tables
+        run: mysql --host 127.0.0.1 -uuser -ppassword itfsyntaxdb -e "show tables;"
diff --git a/ajax.php b/ajax.php
index 8875fb597..41467ac59 100644
--- a/ajax.php
+++ b/ajax.php
@@ -359,6 +359,7 @@
     $client_id = intval($_GET['client_id']);
     $ticket_id = intval($_GET['ticket_id']);
 
+    // Get all contacts, to allow tickets to be raised under a specific contact
     $contact_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name FROM contacts
     WHERE contact_client_id = $client_id
     AND contact_archived_at IS NULL
@@ -368,7 +369,7 @@
         $response['contacts'][] = $row;
     }
 
-
+    // Get ticket details
     $ticket_sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets
     WHERE scheduled_ticket_id = $ticket_id
     AND scheduled_ticket_client_id = $client_id LIMIT 1");
@@ -376,11 +377,26 @@
         $response['ticket'][] = $row;
     }
 
+    // Get assets
     $asset_sql = mysqli_query($mysqli, "SELECT asset_id, asset_name FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL");
     while ($row = mysqli_fetch_array($asset_sql)) {
         $response['assets'][] = $row;
     }
 
+    // Get technicians to auto assign the ticket to
+    $sql_agents = mysqli_query(
+        $mysqli,
+        "SELECT users.user_id, user_name FROM users
+            LEFT JOIN user_settings on users.user_id = user_settings.user_id
+            WHERE user_role > 1
+            AND user_status = 1
+            AND user_archived_at IS NULL
+            ORDER BY user_name ASC"
+    );
+    while ($row = mysqli_fetch_array($sql_agents)) {
+        $response['agents'][] = $row;
+    }
+
     echo json_encode($response);
 
 }
@@ -448,9 +464,9 @@
 
     $contact_sql = mysqli_query(
         $mysqli,
-        "SELECT contact_id, contact_name FROM contacts
+        "SELECT contact_id, contact_name, contact_primary, contact_important, contact_technical FROM contacts
         WHERE contacts.contact_archived_at IS NULL AND contact_client_id = $client_id
-        ORDER BY contact_important DESC, contact_name"
+        ORDER BY contact_primary DESC, contact_technical DESC, contact_important DESC, contact_name"
     );
 
     while ($row = mysqli_fetch_array($contact_sql)) {
diff --git a/client_assets.php b/client_assets.php
index fb963d7e1..cf0881f89 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -109,26 +109,26 @@
                     <div class="col-sm-8">
                         <div class="btn-toolbar float-right">
                             <div class="btn-group mr-5">
-                                <a href="?<?php echo $url_query_strings_sort; ?>&type=" class="btn <?php if ($_GET['type'] == 'all' || empty($_GET['type'])) { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">All Assets <span class="right badge badge-light"><?php echo $all_count; ?></span></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&type=" class="btn <?php if ($_GET['type'] == 'all' || empty($_GET['type'])) { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">All Assets<span class="right badge badge-light ml-2"><?php echo $all_count; ?></span></a>
                                 <?php
                                 if ($workstation_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop"></i> Workstations <span class="right badge badge-light"><?php echo $workstation_count; ?></span></a>
+                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Workstations<span class="right badge badge-light ml-2"><?php echo $workstation_count; ?></span></a>
                                     <?php
                                 }
                                 if ($server_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server"></i> Servers <span class="right badge badge-light"><?php echo $server_count; ?></span></a>
+                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server mr-2"></i>Servers<span class="right badge badge-light ml-2"><?php echo $server_count; ?></span></a>
                                     <?php
                                 }
                                 if ($virtual_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud"></i> Virtual <span class="right badge badge-light"><?php echo $virtual_count; ?></span></a>
+                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud mr-2"></i>Virtual<span class="right badge badge-light ml-2"><?php echo $virtual_count; ?></span></a>
                                     <?php
                                 }
                                 if ($network_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired"></i> Network <span class="right badge badge-light"><?php echo $network_count; ?></span></a>
+                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired mr-2"></i>Network<span class="right badge badge-light ml-2"><?php echo $network_count; ?></span></a>
                                     <?php
                                 }
                                 if ($other_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag"></i> Other <span class="right badge badge-light"><?php echo $other_count; ?></span></a>
+                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag mr-2"></i>Other<span class="right badge badge-light ml-2"><?php echo $other_count; ?></span></a>
                                     <?php
                                 } ?>
                             </div>
@@ -172,18 +172,18 @@
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">Name / Description</a></th>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">Name</a></th>
                             <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
                                 <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">Type</a></th>
                             <?php }
                             if ($_GET['type'] !== 'virtual') { ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">Make / Model</a></th>
+                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">Model</a></th>
                             <?php }
                             if ($_GET['type'] !== 'virtual') { ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">Serial Number</a></th>
+                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">Serial</a></th>
                             <?php }
                             if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">Operating System</a></th>
+                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">OS</a></th>
                             <?php } ?>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_ip&order=<?php echo $disp; ?>">IP</a></th>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">Install Date</a></th>
@@ -224,9 +224,9 @@
                             }
                             $asset_ip = nullable_htmlentities($row['asset_ip']);
                             if (empty($asset_ip)) {
-                                $asset_ip_display = "-";
+                                $asset_ip_display = "DHCP";
                             } else {
-                                $asset_ip_display = "$asset_ip<button class='btn btn-sm clipboardjs' type='button' data-clipboard-text=" . $asset_ip . "><i class='far fa-copy text-secondary'></i></button>";
+                                $asset_ip_display = $asset_ip;
                             }
                             $asset_nat_ip = nullable_htmlentities($row['asset_nat_ip']);
                             $asset_mac = nullable_htmlentities($row['asset_mac']);
@@ -282,67 +282,21 @@
                                         <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
                                     </div>
                                 </td>
-                                <th>
-                                    <i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i>
-                                    <a class="text-secondary" href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>"><?php echo $asset_name; ?></a>
-                                    <?php if(!empty($asset_uri)){ ?>
-                                        <a href="<?php echo $asset_uri; ?>" target="_blank"><i class="fas fa-fw fa-external-link-alt ml-2"></i></a>
-                                    <?php } ?>
-                                    <?php
-                                    if ($login_count > 0) {
-                                        ?>
-                                        <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $login_id; ?>"><i class="fas fa-key text-dark"></i></button>
-
-                                        <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
-                                            <div class="modal-dialog">
-                                                <div class="modal-content bg-dark">
-                                                    <div class="modal-header">
-                                                        <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
-                                                        <button type="button" class="close text-white" data-dismiss="modal">
-                                                            <span>&times;</span>
-                                                        </button>
-                                                    </div>
-                                                    <div class="modal-body bg-white">
-                                                        <?php
-                                                        while ($row = mysqli_fetch_array($sql_logins)) {
-                                                            $login_id = intval($row['login_id']);
-                                                            $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
-                                                            $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
-                                                        ?>
-                                                        <div class="form-group">
-                                                            <div class="input-group">
-                                                                <div class="input-group-prepend">
-                                                                    <span class="input-group-text"><i class="fa fa-user"></i></span>
-                                                                </div>
-                                                                <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
-                                                                <div class="input-group-append">
-                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <div class="input-group">
-                                                                <div class="input-group-prepend">
-                                                                    <span class="input-group-text"><i class="fa fa-lock"></i></span>
-                                                                </div>
-                                                                <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
-                                                                <div class="input-group-append">
-                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <?php } ?>
-                                                    </div>
-                                                </div>
+                                <td>
+                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="text-secondary">
+                                        <div class="media">
+                                            <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
+                                            <div class="media-body">
+                                                <p>
+                                                    <strong><?php echo $asset_name; ?></strong>
+                                                    <br>
+                                                    <small><?php echo $asset_description; ?></small>
+                                                </p>
                                             </div>
                                         </div>
+                                    </a>
+                                </td>
 
-                                    <?php } ?>
-                                    <div class="mt-0">
-                                        <small class="text-muted"><?php echo $asset_description; ?></small>
-                                    </div>
-
-                                </th>
                                 <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
                                     <td><?php echo $asset_type; ?></td>
                                 <?php } ?>
@@ -360,40 +314,93 @@
                                 <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
                                     <td><?php echo $asset_os_display; ?></td>
                                 <?php } ?>
-                                <td class="text-nowrap"><?php echo $asset_ip_display; ?></td>
+                                <td><?php echo $asset_ip_display; ?></td>
                                 <td><?php echo $asset_install_date_display; ?></td>
                                 <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?>
                                     <td><?php echo $contact_name_display; ?></td>
                                 <?php } ?>
                                 <td><?php echo $location_name_display; ?></td>
                                 <td><?php echo $asset_status; ?></td>
-                                <td>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
-                                        <div class="dropdown-menu">
-                                            <!-- Interfaces is still in Development also we may not complete this and may recommend to document in notes or seperate document linking to the asset
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addAssetInterfaceModal<?php echo $asset_id; ?>">
-                                                <i class="fas fa-fw fa-ethernet mr-2"></i>Interfaces
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                            -->
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editAssetModal<?php echo $asset_id; ?>">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#copyAssetModal<?php echo $asset_id; ?>">
-                                                <i class="fas fa-fw fa-copy mr-2"></i>Copy
-                                            </a>
-                                            <?php if ($session_user_role > 2) { ?>
-                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>">
-                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <?php if ($login_count > 0) { ?>
+                                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $asset_id; ?>"><i class="fas fa-key text-dark"></i></button>
+
+                                        <div class="modal" id="viewPasswordModal<?php echo $asset_id; ?>" tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <div class="modal-content bg-dark">
+                                                    <div class="modal-header">
+                                                        <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
+                                                        <button type="button" class="close text-white" data-dismiss="modal">
+                                                            <span>&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body bg-white">
+
+                                                        <?php while ($row = mysqli_fetch_array($sql_logins)) {
+                                                            $login_id = intval($row['login_id']);
+                                                            $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
+                                                            $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
+                                                            ?>
+
+                                                            <div class="form-group">
+                                                                <div class="input-group">
+                                                                    <div class="input-group-prepend">
+                                                                        <span class="input-group-text"><i class="fa fa-user"></i></span>
+                                                                    </div>
+                                                                    <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
+                                                                    <div class="input-group-append">
+                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="form-group">
+                                                                <div class="input-group">
+                                                                    <div class="input-group-prepend">
+                                                                        <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                                                                    </div>
+                                                                    <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
+                                                                    <div class="input-group-append">
+                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                        <?php } ?>
+
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <?php } ?>
+
+                                        <?php if (!empty($asset_uri)) { ?>
+                                            <a class="btn btn-default btn-sm" href="<?php echo $asset_uri; ?>" target="_blank"><i class="fas fa-fw fa-external-link-alt"></i></a>
+                                        <?php } ?>
+                                        
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
+                                            <div class="dropdown-menu">
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editAssetModal<?php echo $asset_id; ?>">
+                                                    <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
-                                                <?php if ($config_destructive_deletes_enable) { ?>
-                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>">
-                                                    <i class="fas fa-fw fa-archive mr-2"></i>Delete
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#copyAssetModal<?php echo $asset_id; ?>">
+                                                    <i class="fas fa-fw fa-copy mr-2"></i>Copy
                                                 </a>
-                                                <?php } ?>
+                                                <?php if ($session_user_role > 2) { ?>
+                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>">
+                                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                                    </a>
+                                                    <?php if ($config_destructive_deletes_enable) { ?>
+                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>">
+                                                        <i class="fas fa-fw fa-archive mr-2"></i>Delete
+                                                    </a>
+                                                    <?php } ?>
 
-                                            <?php } ?>
+                                                <?php } ?>
+                                            </div>
                                         </div>
                                     </div>
                                 </td>
@@ -405,7 +412,6 @@
 
                             require "client_asset_copy_modal.php";
 
-                            //require "client_asset_interface_add_modal.php";
 
                         }
 
diff --git a/client_contact_details.php b/client_contact_details.php
index 6eeaffd67..3f1a71d2d 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -221,12 +221,12 @@
                                     <td><?php echo $asset_type; ?></td>
                                     <td>
                                         <?php echo $asset_make; ?>
-                                        <div class="mt-0"> 
+                                        <div class="mt-0">
                                             <small class="text-muted"><?php echo $asset_model; ?></small>
                                         </div>
                                     </td>
                                     <td><?php echo $asset_serial_display; ?></td>
-                                    
+
                                     <td><?php echo $asset_install_date_display; ?></td>
                                     <td><?php echo $asset_status; ?></td>
                                     <td>
@@ -580,26 +580,23 @@ function updateContactNotes(contact_id) {
     <script>
 
         function generatePassword(type, id) {
-            var url = '/ajax.php?get_readable_pass=true';
-
-            // Make an AJAX request to the server
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', url, true);
-
-            xhr.onreadystatechange = function () {
-                if (xhr.readyState == 4 && xhr.status == 200) {
-                    var password = xhr.responseText;
-
-                    // Set the password value based on the type
+            // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+            jQuery.get(
+                "ajax.php", {
+                    get_readable_pass: 'true'
+                },
+                function(data) {
+                    //If we get a response from post.php, parse it as JSON
+                    const password = JSON.parse(data);
+
+                    // Set the password value to the correct modal, based on the type
                     if (type == "add") {
                         document.getElementById("password-add").value = password;
                     } else if (type == "edit") {
-                        console.log("password-edit-"+id.toString());
                         document.getElementById("password-edit-"+id.toString()).value = password;
                     }
                 }
-            };
-            xhr.send();
+            );
         }
 
         $(document).ready(function() {
diff --git a/client_contacts.php b/client_contacts.php
index 8a1c95357..4ebe9c465 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -106,7 +106,7 @@
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <th class="text-center px-0"><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">Name</a></th>
+                            <th><a class="text-secondary ml-3" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">Name</a></th>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_department&order=<?php echo $disp; ?>">Department</a></th>
                             <th>Contact</th>
                             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">Location</a></th>
@@ -121,13 +121,13 @@
                             $contact_name = nullable_htmlentities($row['contact_name']);
                             $contact_title = nullable_htmlentities($row['contact_title']);
                             if (empty($contact_title)) {
-                                $contact_title_display = "-";
+                                $contact_title_display = "";
                             } else {
                                 $contact_title_display = "<small class='text-secondary'>$contact_title</small>";
                             }
                             $contact_department = nullable_htmlentities($row['contact_department']);
                             if (empty($contact_department)) {
-                                $contact_department_display = "";
+                                $contact_department_display = "-";
                             } else {
                                 $contact_department_display = $contact_department;
                             }
@@ -210,28 +210,31 @@
                                         <input class="form-check-input bulk-select" type="checkbox" name="contact_ids[]" value="<?php echo $contact_id ?>">
                                     </div>
                                 </td>
-                                <td class="px-0 text-center <?php if(!empty($contact_important)) { echo "text-bold"; }?>">
+                                <td>
                                     <a class="text-dark" href="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>">
-                                        <?php if (!empty($contact_photo)) { ?>
-
-                                            <img class="img-size-50 img-circle" src="<?php echo "uploads/clients/$client_id/$contact_photo"; ?>">
-
-                                        <?php } else { ?>
+                                        <div class="media">
+                                            <?php if (!empty($contact_photo)) { ?>
+                                                <span class="fa-stack fa-2x mr-3 text-center">
+                                                    <img class="img-size-50 img-circle" src="<?php echo "uploads/clients/$client_id/$contact_photo"; ?>">
+                                                </span>
+                                            <?php } else { ?>
+
+                                                <span class="fa-stack fa-2x mr-3">
+                                                    <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                                                    <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
+                                                </span>
 
-                                            <span class="fa-stack fa-2x">
-                                                <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                                                <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
-                                            </span>
-
-                                            <br>
+                                            <?php } ?>
 
-                                        <?php } ?>
-                                        <div class="text-dark"><?php echo $contact_name; ?></div>
-                                        <div><?php echo $contact_title_display; ?></div>
-                                        <div><?php echo $contact_primary_display; ?></div>
+                                            <div class="media-body">
+                                                <div class="<?php if(!empty($contact_important)) { echo "text-bold"; } ?>"><?php echo $contact_name; ?></div>
+                                                <?php echo $contact_title_display; ?>
+                                                <div><?php echo $contact_primary_display; ?></div>
+                                                    
+                                            </div>
+                                        </div>
                                     </a>
                                 </td>
-
                                 <td><?php echo $contact_department_display; ?></td>
                                 <td><?php echo $contact_info_display; ?></td>
                                 <td><?php echo $location_name_display; ?></td>
@@ -293,26 +296,23 @@
 <script>
 
     function generatePassword(type, id) {
-        var url = '/ajax.php?get_readable_pass=true';
-
-        // Make an AJAX request to the server
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', url, true);
-
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState == 4 && xhr.status == 200) {
-                var password = xhr.responseText;
-
-                // Set the password value based on the type
+        // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+        jQuery.get(
+            "ajax.php", {
+                get_readable_pass: 'true'
+            },
+            function(data) {
+                //If we get a response from post.php, parse it as JSON
+                const password = JSON.parse(data);
+
+                // Set the password value to the correct modal, based on the type
                 if (type == "add") {
                     document.getElementById("password-add").value = password;
                 } else if (type == "edit") {
-                    console.log("password-edit-"+id.toString());
                     document.getElementById("password-edit-"+id.toString()).value = password;
                 }
             }
-        };
-        xhr.send();
+        );
     }
 
     $(document).ready(function() {
diff --git a/client_file_upload_modal.php b/client_file_upload_modal.php
index 89b6c3ac6..68e297482 100644
--- a/client_file_upload_modal.php
+++ b/client_file_upload_modal.php
@@ -11,7 +11,19 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
+                    
+                    <div class="form-group">
+                        <label>Description</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="description" placeholder="Description of the file">
+                        </div>
+                    </div>
+
                     <div class="form-group mb-4">
+                        <label>Folder</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
diff --git a/client_files.php b/client_files.php
index 86231d60e..c9ba024bc 100644
--- a/client_files.php
+++ b/client_files.php
@@ -45,7 +45,7 @@
     WHERE file_client_id = $client_id
     AND file_folder_id = $folder_id
     AND file_archived_at IS NULL
-    AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%')
+    AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
     $query_images
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
@@ -147,6 +147,7 @@
                 <form autocomplete="off">
                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                     <input type="hidden" name="view" value="<?php echo $view; ?>">
+                    <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
                     <div class="row">
                         <div class="col-md-4">
                             <div class="input-group mb-3 mb-md-0">
@@ -249,6 +250,7 @@
                             while ($row = mysqli_fetch_array($sql)) {
                                 $file_id = intval($row['file_id']);
                                 $file_name = nullable_htmlentities($row['file_name']);
+                                $file_description = nullable_htmlentities($row['file_description']);
                                 $file_reference_name = nullable_htmlentities($row['file_reference_name']);
                                 $file_ext = nullable_htmlentities($row['file_ext']);
                                 if ($file_ext == 'pdf') {
@@ -283,7 +285,20 @@
                                             <input class="form-check-input bulk-select" type="checkbox" name="file_ids[]" value="<?php echo $file_id ?>">
                                         </div>
                                     </td>
-                                    <td><a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" class="text-secondary"><i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i> <?php echo basename($file_name); ?></a></td>
+                                    <td>
+                                        <a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" class="text-secondary">
+                                            <div class="media">
+                                                <i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i>
+                                                <div class="media-body">
+                                                    <p>
+                                                        <?php echo basename($file_name); ?>
+                                                        <br>
+                                                        <small class="text-secondary"><?php echo $file_description; ?></small>
+                                                    </p>
+                                                </div>
+                                            </div>
+                                        </a>
+                                    </td>
                                     <td><?php echo $file_created_at; ?></td>
                                     <td>
                                         <div class="dropdown dropleft text-center">
diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index 1781528bb..aa9bd6bf0 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -13,21 +13,25 @@
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-address">Address</a>
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-contact">Contact</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
                         </li>
+                        
                     </ul>
 
                     <hr>
 
                     <div class="tab-content">
 
-                        <div class="tab-pane fade show active" id="pills-address">
+                        <div class="tab-pane fade show active" id="pills-details">
 
                             <div class="form-group">
                                 <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
@@ -44,6 +48,25 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Photo</label>
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-address">
+
                             <div class="form-group">
                                 <label>Address</label>
                                 <div class="input-group">
@@ -151,10 +174,10 @@
 
                         </div>
 
-                        <div class="tab-pane fade" id="pills-photo">
+                        <div class="tab-pane fade" id="pills-notes">
 
                             <div class="form-group">
-                                <input type="file" class="form-control-file" name="file">
+                                <textarea class="form-control" rows="12" name="notes" placeholder="Notes, eg Parking Info, Building Access etc"></textarea>
                             </div>
 
                         </div>
diff --git a/client_location_edit_modal.php b/client_location_edit_modal.php
index 6ba5c5735..9024de8ee 100644
--- a/client_location_edit_modal.php
+++ b/client_location_edit_modal.php
@@ -15,13 +15,16 @@
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $location_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $location_id; ?>">Contact</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $location_id; ?>">Photo</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $location_id; ?>">Notes</a>
                         </li>
                     </ul>
 
@@ -29,7 +32,47 @@
 
                     <div class="tab-content">
 
-                        <div class="tab-pane fade show active" id="pills-address<?php echo $location_id; ?>">
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $location_id; ?>">
+
+                            <div class="form-group">
+                                <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Name of location" value="<?php echo $location_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="location_primary" value="1" <?php if ($location_primary == 1) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="description" placeholder="Short Description" value="<?php echo $location_description; ?>">
+                                </div>
+                            </div>
+
+                            <div class="mb-3" style="text-align: center;">
+                                <?php if (!empty($location_photo)) { ?>
+                                    <img class="img-fluid" src="<?php echo "uploads/clients/$client_id/$location_photo"; ?>">
+                                <?php } ?>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Photo</label>
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-address<?php echo $location_id; ?>">
 
                             <div class="form-group">
                                 <label>Location Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary</span></label>
@@ -160,16 +203,10 @@
 
                         </div>
 
-                        <div class="tab-pane fade" id="pills-photo<?php echo $location_id; ?>">
-
-                            <div class="mb-3" style="text-align: center;">
-                                <?php if (!empty($location_photo)) { ?>
-                                    <img class="img-fluid" src="<?php echo "uploads/clients/$client_id/$location_photo"; ?>">
-                                <?php } ?>
-                            </div>
+                        <div class="tab-pane fade" id="pills-notes<?php echo $location_id; ?>">
 
                             <div class="form-group">
-                                <input type="file" class="form-control-file" name="file">
+                                <textarea class="form-control" rows="12" name="notes" placeholder="Notes, eg Parking Info, Building Access etc"><?php echo $location_notes; ?></textarea>
                             </div>
 
                         </div>
diff --git a/client_location_import_modal.php b/client_location_import_modal.php
index 1b499b035..42cf942e8 100644
--- a/client_location_import_modal.php
+++ b/client_location_import_modal.php
@@ -10,7 +10,7 @@
 			<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
 				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 				<div class="modal-body bg-white">
-					<p><strong>Format csv file with headings & data:</strong><br>Name, Address, City, State, Postal Code, Phone, Hours</p>
+					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Address, City, State, Postal Code, Phone, Hours</p>
 					<hr>
 					<div class="form-group my-4">
 						<input type="file" class="form-control-file" name="file" accept=".csv">
diff --git a/client_locations.php b/client_locations.php
index 6745c39d8..9b6a489ac 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -15,7 +15,7 @@
     "SELECT SQL_CALC_FOUND_ROWS * FROM locations 
     WHERE location_client_id = $client_id
     AND location_$archive_query
-    AND (location_name LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') 
+    AND (location_name LIKE '%$q%' OR location_description LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone LIKE '%$phone_query%') 
     ORDER BY location_primary DESC, $sort $order LIMIT $record_from, $record_to"
 );
 
@@ -89,6 +89,7 @@
                 while ($row = mysqli_fetch_array($sql)) {
                     $location_id = intval($row['location_id']);
                     $location_name = nullable_htmlentities($row['location_name']);
+                    $location_description = nullable_htmlentities($row['location_description']);
                     $location_country = nullable_htmlentities($row['location_country']);
                     $location_address = nullable_htmlentities($row['location_address']);
                     $location_city = nullable_htmlentities($row['location_city']);
@@ -112,18 +113,28 @@
                     $location_contact_id = intval($row['location_contact_id']);
                     $location_primary = intval($row['location_primary']);
                     if ( $location_primary == 1 ) {
-                        $location_primary_display = "<p class='text-success'>Primary Location</p>";
+                        $location_primary_display = "<small class='text-success ml-1'><i class='fa fa-fw fa-check'></i> Primary</small>";
                     } else {
                         $location_primary_display = "";
                     }
 
                     ?>
                     <tr>
-                        <th>
-                            <i class="fa fa-fw fa-map-marker-alt text-secondary"></i>
-                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editLocationModal<?php echo $location_id; ?>"><?php echo $location_name; ?></a>
-                            <?php echo $location_primary_display; ?>
-                        </th>
+                        <td>
+                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editLocationModal<?php echo $location_id; ?>">
+                                <div class="media">
+                                    <i class="fa fa-fw fa-2x fa-map-marker-alt text-secondary mr-3 mt-1"></i>
+                                    <div class="media-body">
+                                        <p>
+                                            <strong><?php echo $location_name; ?></strong><?php echo $location_primary_display; ?>
+                                            <br>
+                                            <small class="text-secondary"><?php echo $location_description; ?></small>
+                                            
+                                        </p>
+                                    </div>
+                                </div>
+                            </a>
+                        </td>
                         <td><a href="//maps.<?php echo $session_map_source; ?>.com?q=<?php echo "$location_address $location_zip"; ?>" target="_blank"><?php echo $location_address; ?><br><?php echo "$location_city $location_state $location_zip"; ?></a></td>
                         <td><?php echo $location_phone_display; ?></td>
                         <td><?php echo $location_hours_display; ?></td>
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index ddcc799de..00aab3e36 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -175,12 +175,19 @@
                                         <option value="">- Asset -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $asset_id = intval($row['asset_id']);
                                             $asset_name = nullable_htmlentities($row['asset_name']);
+                                            $asset_location = nullable_htmlentities($row['location_name']);
+
+                                            $asset_display_string = $asset_name;
+                                            if (!empty($asset_location)) {
+                                                $asset_display_string = "$asset_name ($asset_location)";
+                                            }
+
                                             ?>
-                                            <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
+                                            <option value="<?php echo $asset_id; ?>"><?php echo $asset_display_string; ?></option>
 
                                             <?php
                                         }
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 209184f0a..dfe8ed535 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -184,12 +184,19 @@
                                         <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");
+                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = intval($row['asset_id']);
                                             $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                            $asset_location_select = nullable_htmlentities($row['location_name']);
+
+                                            $asset_select_display_string = $asset_name_select;
+                                            if (!empty($asset_location_select)) {
+                                                $asset_select_display_string = "$asset_name_select ($asset_location_select)";
+                                            }
+
                                             ?>
-                                            <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                            <option <?php if ($login_asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_select_display_string; ?></option>
 
                                         <?php } ?>
                                     </select>
diff --git a/cron.php b/cron.php
index 0b8adfd8e..416def9de 100644
--- a/cron.php
+++ b/cron.php
@@ -249,10 +249,16 @@
         $priority = sanitizeInput($row['scheduled_ticket_priority']);
         $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency']));
         $created_id = intval($row['scheduled_ticket_created_by']);
+        $assigned_id = intval($row['scheduled_ticket_assigned_to']);
         $client_id = intval($row['scheduled_ticket_client_id']);
         $contact_id = intval($row['scheduled_ticket_contact_id']);
         $asset_id = intval($row['scheduled_ticket_asset_id']);
 
+        $ticket_status = 'New'; // Default
+        if ($assigned_id > 0) {
+            $ticket_status = 'Open'; // Set to open if we've auto-assigned an agent
+        }
+
         // Assign this new ticket the next ticket number
         $ticket_number_sql = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_next_number FROM settings WHERE company_id = 1"));
         $ticket_number = intval($ticket_number_sql['config_ticket_next_number']);
@@ -262,7 +268,7 @@
         mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
 
         // Raise the ticket
-        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 = 'New', ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_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 = '$ticket_status', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id");
         $id = mysqli_insert_id($mysqli);
 
         // Logging
@@ -316,7 +322,7 @@
         if (filter_var($config_ticket_new_ticket_notification_email, FILTER_VALIDATE_EMAIL)) {
 
             $email_subject = "ITFlow - New Recurring Ticket - $client_name: $ticket_subject";
-            $email_body = "Hello, <br><br>This is a notification that a recurring scheduled ticket has been raised in ITFlow. <br>Ticket: $ticket_prefix$ticket_number<br>Client: $client_name<br>Priority: $priority<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$ticket_subject</b><br>$ticket_details";
+            $email_body = "Hello, <br><br>This is a notification that a recurring (scheduled) ticket has been raised in ITFlow. <br>Ticket: $ticket_prefix$ticket_number<br>Client: $client_name<br>Priority: $priority<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$ticket_subject</b><br>$ticket_details";
 
             $email = [
                     'from' => $config_ticket_from_email,
diff --git a/database_updates.php b/database_updates.php
index dcb29a4e7..98f8bbd55 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1560,7 +1560,7 @@
     }
 
 
-        
+
     if (CURRENT_DATABASE_VERSION == '1.0.2') {
         //Insert queries here required to update to DB version 1.0.3
         mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_stripe_expense_vendor` INT(11) NOT NULL DEFAULT 0 AFTER `config_stripe_account`");
@@ -1610,7 +1610,7 @@
     if (CURRENT_DATABASE_VERSION == '1.0.6') {
         // Insert queries here required to update to DB version 1.0.7
         mysqli_query($mysqli, "CREATE TABLE `remember_tokens` (`remember_token_id` int(11) NOT NULL AUTO_INCREMENT,`remember_token_token` varchar(255) NOT NULL,`remember_token_user_id` int(11) NOT NULL,`remember_token_created_at` datetime NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`remember_token_id`))");
-        
+
         // Then, update the database to the next sequential version
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.7'");
     }
@@ -1619,7 +1619,7 @@
     //     // Insert queries here required to update to DB version 1.0.8
 
         mysqli_query($mysqli, "ALTER TABLE `user_settings` DROP `user_config_remember_me_token`");
-   
+
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.8'");
     }
 
@@ -1628,18 +1628,70 @@
         mysqli_query($mysqli, "ALTER TABLE `assets` DROP `asset_login_id`");
         // Dropped this unused Table as we don't need many to many relationship between assets and logins
         mysqli_query($mysqli, "DROP TABLE asset_logins");
-   
+
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.9'");
     }
 
     if (CURRENT_DATABASE_VERSION == '1.0.9') {
         mysqli_query($mysqli, "ALTER TABLE `transfers` ADD `transfer_method` VARCHAR(200) DEFAULT NULL AFTER `transfer_id`");
-   
+
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.0'");
     }
 
     if (CURRENT_DATABASE_VERSION == '1.1.0') {
-        // Insert queries here required to update to DB version 1.1.1
+
+        mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_description` TEXT DEFAULT NULL AFTER `file_name`");
+        mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `file_hash`");
+
+        mysqli_query($mysqli, "ALTER TABLE `documents` ADD `document_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `document_content_raw`");
+
+        mysqli_query($mysqli, "ALTER TABLE `assets` ADD `asset_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `asset_notes`");
+
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'");
+    }
+
+    if (CURRENT_DATABASE_VERSION == '1.1.1') {
+        mysqli_query($mysqli, "ALTER TABLE `scheduled_tickets` ADD `scheduled_ticket_assigned_to` INT(11) NOT NULL DEFAULT '0' AFTER `scheduled_ticket_created_by`");
+
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.2'");
+    }
+
+    if (CURRENT_DATABASE_VERSION == '1.1.2') {
+        // Add DB support for multiple contacts under a vendor
+        mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_vendor_id` INT(11) NOT NULL DEFAULT '0' AFTER `contact_location_id`");
+
+        // Add DB Support to Associate files to an asset example pictures, config backups etc
+        mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_asset_id` INT(11) NOT NULL DEFAULT '0' AFTER `file_folder_id`");
+
+        // Add DB Support for missing Short Description fields
+        mysqli_query($mysqli, "ALTER TABLE `locations` ADD `location_description` TEXT DEFAULT NULL AFTER `location_name`");
+        mysqli_query($mysqli, "ALTER TABLE `software` ADD `software_description` TEXT DEFAULT NULL AFTER `software_name`");
+        mysqli_query($mysqli, "ALTER TABLE `networks` ADD `network_description` TEXT DEFAULT NULL AFTER `network_name`");
+        mysqli_query($mysqli, "ALTER TABLE `certificates` ADD `certificate_description` TEXT DEFAULT NULL AFTER `certificate_name`");
+        mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_description` TEXT DEFAULT NULL AFTER `domain_name`");
+
+        // Add DB Support for Location for Events
+        mysqli_query($mysqli, "ALTER TABLE `events` ADD `event_location` TEXT DEFAULT NULL AFTER `event_title`");
+
+        // Add Event Attendees Table to allow multiple Attendees per event
+        mysqli_query($mysqli, "CREATE TABLE `event_attendees` (
+            `attendee_id` INT(11) NOT NULL AUTO_INCREMENT,
+            `attendee_name` VARCHAR(200) DEFAULT NULL,
+            `attendee_email` VARCHAR(200) DEFAULT NULL,
+            `attendee_invitation_status` TINYINT(1) NOT NULL DEFAULT 0,
+            `attendee_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(),
+            `attendee_updated_at` DATETIME DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+            `attendee_archived_at` DATETIME DEFAULT NULL,
+            `attendee_contact_id` INT(11) NOT NULL DEFAULT 0,
+            `attendee_event_id` INT(11) NOT NULL,
+            PRIMARY KEY (`attendee_id`)
+        )");
+
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.3'");
+    }
+
+   if (CURRENT_DATABASE_VERSION == '1.1.3') {
+  // Insert queries here required to update to DB version 1.1.1
         mysqli_query($mysqli, "CREATE TABLE `inventory` (
             `inventory_id` int(11) NOT NULL AUTO_INCREMENT,
             `inventory_product_id` int(11) NOT NULL,
@@ -1684,9 +1736,10 @@
         mysqli_query($mysqli, "CREATE TABLE `credits` (`credit_id` int(11) NOT NULL AUTO_INCREMENT,`credit_amount` decimal(15,2) NOT NULL,`credit_currency_code` varchar(200) NOT NULL,`credit_date` date NOT NULL,`credit_reference` text DEFAULT NULL,`credit_created_at` datetime NOT NULL DEFAULT current_timestamp(),`credit_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),`credit_archived_at` datetime DEFAULT NULL, `credit_client_id` int(11) NOT NULL,`credit_payment_id` int(11) NOT NULL,`credit_account_id` int(11) NOT NULL, PRIMARY KEY (`credit_id`))");  
 
         // Then, update the database to the next sequential version
-        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.1'");
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'");
     }
 
+=======
 
 } else {
     // Up-to-date
diff --git a/database_version.php b/database_version.php
index e66d0fb42..62e7c7065 100644
--- a/database_version.php
+++ b/database_version.php
@@ -5,8 +5,5 @@
  * It is used in conjunction with database_updates.php
  */
 
-
-DEFINE("LATEST_DATABASE_VERSION", "1.1.1");
-
-
+DEFINE("LATEST_DATABASE_VERSION", "1.1.4");
 
diff --git a/db.sql b/db.sql
index 854ebadc7..6d6172198 100644
--- a/db.sql
+++ b/db.sql
@@ -143,6 +143,7 @@ CREATE TABLE `assets` (
   `asset_warranty_expire` date DEFAULT NULL,
   `asset_install_date` date DEFAULT NULL,
   `asset_notes` text DEFAULT NULL,
+  `asset_important` tinyint(1) NOT NULL DEFAULT 0,
   `asset_created_at` datetime NOT NULL DEFAULT current_timestamp(),
   `asset_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
   `asset_archived_at` datetime DEFAULT NULL,
@@ -225,6 +226,7 @@ DROP TABLE IF EXISTS `certificates`;
 CREATE TABLE `certificates` (
   `certificate_id` int(11) NOT NULL AUTO_INCREMENT,
   `certificate_name` varchar(200) NOT NULL,
+  `certificate_description` text DEFAULT NULL,
   `certificate_domain` varchar(200) DEFAULT NULL,
   `certificate_issued_by` varchar(200) NOT NULL,
   `certificate_expire` date DEFAULT NULL,
@@ -395,6 +397,7 @@ CREATE TABLE `contacts` (
   `contact_archived_at` datetime DEFAULT NULL,
   `contact_accessed_at` datetime DEFAULT NULL,
   `contact_location_id` int(11) NOT NULL DEFAULT 0,
+  `contact_vendor_id` int(11) NOT NULL DEFAULT 0,
   `contact_department` varchar(200) DEFAULT NULL,
   `contact_client_id` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`contact_id`)
@@ -484,6 +487,7 @@ CREATE TABLE `documents` (
   `document_description` text DEFAULT NULL,
   `document_content` longtext NOT NULL,
   `document_content_raw` longtext NOT NULL,
+  `document_important` tinyint(1) NOT NULL DEFAULT 0,
   `document_parent` int(11) NOT NULL DEFAULT 0,
   `document_created_at` datetime NOT NULL DEFAULT current_timestamp(),
   `document_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
@@ -509,6 +513,7 @@ DROP TABLE IF EXISTS `domains`;
 CREATE TABLE `domains` (
   `domain_id` int(11) NOT NULL AUTO_INCREMENT,
   `domain_name` varchar(200) NOT NULL,
+  `domain_description` text DEFAULT NULL,
   `domain_expire` date DEFAULT NULL,
   `domain_ip` varchar(255) DEFAULT NULL,
   `domain_name_servers` varchar(255) DEFAULT NULL,
@@ -552,6 +557,27 @@ CREATE TABLE `email_queue` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `event_attendees`
+--
+
+DROP TABLE IF EXISTS `event_attendees`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `event_attendees` (
+  `attendee_id` int(11) NOT NULL AUTO_INCREMENT,
+  `attendee_name` varchar(200) DEFAULT NULL,
+  `attendee_email` varchar(200) DEFAULT NULL,
+  `attendee_invitation_status` tinyint(1) NOT NULL DEFAULT 0,
+  `attendee_created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `attendee_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
+  `attendee_archived_at` datetime DEFAULT NULL,
+  `attendee_contact_id` int(11) NOT NULL DEFAULT 0,
+  `attendee_event_id` int(11) NOT NULL,
+  PRIMARY KEY (`attendee_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `events`
 --
@@ -562,6 +588,7 @@ DROP TABLE IF EXISTS `events`;
 CREATE TABLE `events` (
   `event_id` int(11) NOT NULL AUTO_INCREMENT,
   `event_title` varchar(200) NOT NULL,
+  `event_location` text DEFAULT NULL,
   `event_description` longtext DEFAULT NULL,
   `event_start` datetime NOT NULL,
   `event_end` datetime DEFAULT NULL,
@@ -614,13 +641,16 @@ CREATE TABLE `files` (
   `file_id` int(11) NOT NULL AUTO_INCREMENT,
   `file_reference_name` varchar(200) DEFAULT NULL,
   `file_name` varchar(200) NOT NULL,
+  `file_description` text DEFAULT NULL,
   `file_ext` varchar(200) DEFAULT NULL,
   `file_hash` varchar(200) DEFAULT NULL,
+  `file_important` tinyint(1) NOT NULL DEFAULT 0,
   `file_created_at` datetime NOT NULL DEFAULT current_timestamp(),
   `file_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
   `file_archived_at` datetime DEFAULT NULL,
   `file_accessed_at` datetime DEFAULT NULL,
   `file_folder_id` int(11) NOT NULL DEFAULT 0,
+  `file_asset_id` int(11) NOT NULL DEFAULT 0,
   `file_client_id` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`file_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
@@ -800,6 +830,7 @@ DROP TABLE IF EXISTS `locations`;
 CREATE TABLE `locations` (
   `location_id` int(11) NOT NULL AUTO_INCREMENT,
   `location_name` varchar(200) NOT NULL,
+  `location_description` text DEFAULT NULL,
   `location_country` varchar(200) DEFAULT NULL,
   `location_address` varchar(200) DEFAULT NULL,
   `location_city` varchar(200) DEFAULT NULL,
@@ -885,6 +916,7 @@ DROP TABLE IF EXISTS `networks`;
 CREATE TABLE `networks` (
   `network_id` int(11) NOT NULL AUTO_INCREMENT,
   `network_name` varchar(200) NOT NULL,
+  `network_description` text DEFAULT NULL,
   `network_vlan` int(11) DEFAULT NULL,
   `network` varchar(200) NOT NULL,
   `network_gateway` varchar(200) NOT NULL,
@@ -1179,6 +1211,7 @@ CREATE TABLE `scheduled_tickets` (
   `scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(),
   `scheduled_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
   `scheduled_ticket_created_by` int(11) NOT NULL DEFAULT 0,
+  `scheduled_ticket_assigned_to` int(11) NOT NULL DEFAULT 0,
   `scheduled_ticket_client_id` int(11) NOT NULL DEFAULT 0,
   `scheduled_ticket_contact_id` int(11) NOT NULL DEFAULT 0,
   `scheduled_ticket_asset_id` int(11) NOT NULL DEFAULT 0,
@@ -1428,6 +1461,7 @@ DROP TABLE IF EXISTS `software`;
 CREATE TABLE `software` (
   `software_id` int(11) NOT NULL AUTO_INCREMENT,
   `software_name` varchar(200) NOT NULL,
+  `software_description` text DEFAULT NULL,
   `software_version` varchar(200) DEFAULT NULL,
   `software_type` varchar(200) NOT NULL,
   `software_license_type` varchar(200) DEFAULT NULL,
@@ -1876,4 +1910,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-03-05 18:47:45
+-- Dump completed on 2024-03-19 17:11:58
diff --git a/guest_ajax.php b/guest_ajax.php
index b80560d56..7bc84ff3e 100644
--- a/guest_ajax.php
+++ b/guest_ajax.php
@@ -10,6 +10,8 @@
 
 require_once "functions.php";
 
+require_once "rfc6238.php";
+
 
 /*
  * Creates & Returns a Stripe Payment Intent for a particular invoice ID
@@ -119,3 +121,9 @@
     }
 
 }
+
+if (isset($_GET['get_totp_token'])) {
+    $otp = TokenAuth6238::getTokenCode(strtoupper($_GET['totp_secret']));
+
+    echo json_encode($otp);
+}
diff --git a/guest_view_item.php b/guest_view_item.php
index 82e4150d1..2352dc465 100644
--- a/guest_view_item.php
+++ b/guest_view_item.php
@@ -201,9 +201,9 @@
 
     <script>
         function showOTP(id, secret) {
-            //Send a GET request to ajax.php as ajax.php?get_totp_token=true&totp_secret=SECRET
+            //Send a GET request to ajax.php as guest_ajax.php?get_totp_token=true&totp_secret=SECRET
             jQuery.get(
-                "ajax.php",
+                "guest_ajax.php",
                 {get_totp_token: 'true', totp_secret: secret},
                 function(data) {
                     //If we get a response from post.php, parse it as JSON
diff --git a/js/recurring_tickets_add_modal.js b/js/recurring_tickets_add_modal.js
new file mode 100644
index 000000000..433fb5fe1
--- /dev/null
+++ b/js/recurring_tickets_add_modal.js
@@ -0,0 +1,63 @@
+// Client selected listener
+//  We seem to have to use jQuery to listen for events, as the client input is a select2 component?
+
+const clientSelectDropdown = document.getElementById("changeClientSelect"); // Define client selector
+
+// // If the client selector is disabled, we must be on client_recurring_tickets.php instead. Trigger the contact list update.
+if (clientSelectDropdown.disabled) {
+
+    let client_id = $(clientSelectDropdown).find(':selected').val();
+
+    // Update the contacts dropdown list
+    populateContactsDropdown(client_id);
+}
+
+// Listener for client selection. Populate contact select when a client is selected
+$(clientSelectDropdown).on('select2:select', function (e) {
+    let client_id = $(this).find(':selected').val();
+
+    // Update the contacts dropdown list
+    populateContactsDropdown(client_id);
+
+    // TODO: Update the assets dropdown list
+
+});
+
+// Populate client contact function (after a client is selected)
+function populateContactsDropdown(client_id) {
+    // Send a GET request to ajax.php as ajax.php?get_client_contacts=true&client_id=NUM
+    jQuery.get(
+        "ajax.php",
+        {get_client_contacts: 'true', client_id: client_id},
+        function(data) {
+
+            // If we get a response from ajax.php, parse it as JSON
+            const response = JSON.parse(data);
+
+            // Access the data for contacts (multiple)
+            const contacts = response.contacts;
+
+            // Contacts dropdown
+            const contactSelectDropdown = document.getElementById("contactSelect");
+
+            // Clear Category dropdown
+            let i, L = contactSelectDropdown.options.length - 1;
+            for (i = L; i >= 0; i--) {
+                contactSelectDropdown.remove(i);
+            }
+            contactSelectDropdown[contactSelectDropdown.length] = new Option('- Contact -', '0');
+
+            // Populate dropdown
+            contacts.forEach(contact => {
+                var appendText = "";
+                if (contact.contact_primary == "1") {
+                    appendText = " (Primary)";
+                } else if (contact.contact_technical == "1") {
+                    appendText = " (Technical)";
+                }
+                contactSelectDropdown[contactSelectDropdown.length] = new Option(contact.contact_name + appendText, contact.contact_id);
+            });
+
+        }
+    );
+}
diff --git a/js/recurring_tickets_edit_modal.js b/js/recurring_tickets_edit_modal.js
index 07de7c6b9..67966341f 100644
--- a/js/recurring_tickets_edit_modal.js
+++ b/js/recurring_tickets_edit_modal.js
@@ -9,9 +9,10 @@ function populateRecurringTicketEditModal(client_id, ticket_id) {
             // If we get a response from post.php, parse it as JSON
             const response = JSON.parse(data);
 
-            // Access the ticket info, and all potential assets
+            // Access the ticket info, agents and all potential assets
             const contacts = response.contacts;
             const ticket = response.ticket[0];
+            const agents = response.agents;
             const assets = response.assets;
 
             // Populate the scheduled ticket modal fields
@@ -22,6 +23,28 @@ function populateRecurringTicketEditModal(client_id, ticket_id) {
             document.getElementById("editTicketNextRun").value = ticket.scheduled_ticket_next_run;
             tinyMCE.get('editTicketDetails').setContent(ticket.scheduled_ticket_details);
 
+            // Agent assignment dropdown
+            var agentDropdown = document.getElementById("editTicketAgent");
+
+            // Clear agent dropdown
+            var i, L = agentDropdown.options.length -1;
+            for(i = L; i >= 0; i--) {
+                agentDropdown.remove(i);
+            }
+            agentDropdown[agentDropdown.length] = new Option('- Agent -', '0');
+
+
+            // Populate dropdown
+            agents.forEach(agent => {
+                if(parseInt(agent.user_id) == parseInt(ticket.scheduled_ticket_assigned_to)){
+                    // Selected agent
+                    agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id, true, true);
+                }
+                else{
+                    agentDropdown[agentDropdown.length] = new Option(agent.user_name, agent.user_id);
+                }
+            });
+
             // Contact dropdown
             var contactDropdown = document.getElementById("editTicketContact");
 
@@ -61,25 +84,28 @@ function populateRecurringTicketEditModal(client_id, ticket_id) {
             });
 
             // Asset dropdown
-            var assetDropdown = document.getElementById("editTicketAssetId");
+            if (assets && assets.length > 0) {
+                var assetDropdown = document.getElementById("editTicketAssetId");
 
-            // Clear asset dropdown
-            var i, L = assetDropdown.options.length -1;
-            for(i = L; i >= 0; i--) {
-                assetDropdown.remove(i);
+                // Clear asset dropdown
+                var i, L = assetDropdown.options.length -1;
+                for(i = L; i >= 0; i--) {
+                    assetDropdown.remove(i);
+                }
+                assetDropdown[assetDropdown.length] = new Option('- Asset -', '0');
+
+                // Populate dropdown
+                assets.forEach(asset => {
+                    if(parseInt(asset.asset_id) == parseInt(ticket.scheduled_ticket_asset_id)){
+                        // Selected asset
+                        assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id, true, true);
+                    }
+                    else{
+                        assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id);
+                    }
+                });
             }
-            assetDropdown[assetDropdown.length] = new Option('- Asset -', '0');
 
-            // Populate dropdown
-            assets.forEach(asset => {
-                if(parseInt(asset.asset_id) == parseInt(ticket.scheduled_ticket_asset_id)){
-                    // Selected asset
-                    assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id, true, true);
-                }
-                else{
-                    assetDropdown[assetDropdown.length] = new Option(asset.asset_name, asset.asset_id);
-                }
-            });
         }
     );
 }
diff --git a/post/client_locations_model.php b/post/client_locations_model.php
index 0073ad410..8c9cd80c6 100644
--- a/post/client_locations_model.php
+++ b/post/client_locations_model.php
@@ -1,6 +1,7 @@
 <?php
 $client_id = intval($_POST['client_id']);
 $name = sanitizeInput($_POST['name']);
+$description = sanitizeInput($_POST['description']);
 $country = sanitizeInput($_POST['country']);
 $address = sanitizeInput($_POST['address']);
 $city = sanitizeInput($_POST['city']);
diff --git a/post/event.php b/post/event.php
index 2955a31cf..aa729f8d2 100644
--- a/post/event.php
+++ b/post/event.php
@@ -74,7 +74,7 @@
                 'subject' => $subject,
                 'body' => $body
             ]
-            ];
+        ];
         $mail = addToMailQueue($mysqli, $data);
 
         // Logging for email (success/fail)
diff --git a/post/file.php b/post/file.php
index bf49af633..3e5753521 100644
--- a/post/file.php
+++ b/post/file.php
@@ -7,6 +7,7 @@
 if (isset($_POST['upload_files'])) {
     $client_id = intval($_POST['client_id']);
     $folder_id = intval($_POST['folder_id']);
+    $description = sanitizeInput($_POST['description']);
 
     if (!file_exists("uploads/clients/$client_id")) {
         mkdir("uploads/clients/$client_id");
@@ -39,7 +40,7 @@
             // Extract .ext from reference file name to be used to store SHA256 hash
             $file_hash = strstr($file_reference_name, '.', true) ?: $file_reference_name;
 
-            mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_ext = '$file_extension', file_hash = '$file_hash', file_folder_id = $folder_id, file_client_id = $client_id");
+            mysqli_query($mysqli,"INSERT INTO files SET file_reference_name = '$file_reference_name', file_name = '$file_name', file_description = '$description', file_ext = '$file_extension', file_hash = '$file_hash', file_folder_id = $folder_id, file_client_id = $client_id");
 
             //Logging
             $file_id = intval(mysqli_insert_id($mysqli));
diff --git a/post/location.php b/post/location.php
index e75723978..f9e81e9fe 100644
--- a/post/location.php
+++ b/post/location.php
@@ -15,7 +15,7 @@
         mkdir("uploads/clients/$client_id");
     }
 
-    mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact, location_client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact, location_client_id = $client_id");
 
     $location_id = mysqli_insert_id($mysqli);
 
@@ -74,7 +74,7 @@
         mkdir("uploads/clients/$client_id");
     }
 
-    mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact WHERE location_id = $location_id");
+    mysqli_query($mysqli,"UPDATE locations SET location_name = '$name', location_description = '$description', location_country = '$country', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_notes = '$notes', location_contact_id = $contact WHERE location_id = $location_id");
 
     // Update Primay location in clients if primary location is checked
     if ($location_primary == 1) {
@@ -206,12 +206,12 @@
         $f = fopen('php://memory', 'w');
 
         //set column headers
-        $fields = array('Name', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours');
+        $fields = array('Name', 'Description', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours');
         fputcsv($f, $fields, $delimiter);
 
         //output each row of the data, format line as csv and write to file pointer
         while($row = $sql->fetch_assoc()){
-            $lineData = array($row['location_name'], $row['location_address'], $row['location_city'], $row['location_state'], $row['location_zip'], $row['location_phone'], $row['location_hours']);
+            $lineData = array($row['location_name'], $row['location_description'], $row['location_address'], $row['location_city'], $row['location_state'], $row['location_zip'], $row['location_phone'], $row['location_hours']);
             fputcsv($f, $lineData, $delimiter);
         }
 
@@ -258,7 +258,7 @@
     //(Else)Check column count
     $f = fopen($file_name, "r");
     $f_columns = fgetcsv($f, 1000, ",");
-    if(!$error & count($f_columns) != 7) {
+    if(!$error & count($f_columns) != 8) {
         $error = true;
         $_SESSION['alert_message'] = "Bad column count.";
     }
@@ -278,28 +278,31 @@
                 }
             }
             if(isset($column[1])){
-                $address = sanitizeInput($column[1]);
+                $description = sanitizeInput($column[1]);
             }
             if(isset($column[2])){
-                $city = sanitizeInput($column[2]);
+                $address = sanitizeInput($column[2]);
             }
             if(isset($column[3])){
-                $state = sanitizeInput($column[3]);
+                $city = sanitizeInput($column[3]);
             }
             if(isset($column[4])){
-                $zip = sanitizeInput($column[4]);
+                $state = sanitizeInput($column[4]);
             }
             if(isset($column[5])){
-                $phone = preg_replace("/[^0-9]/", '',$column[5]);
+                $zip = sanitizeInput($column[5]);
             }
             if(isset($column[6])){
-                $hours = sanitizeInput($column[6]);
+                $phone = preg_replace("/[^0-9]/", '',$column[6]);
+            }
+            if(isset($column[7])){
+                $hours = sanitizeInput($column[7]);
             }
 
             // Check if duplicate was detected
             if($duplicate_detect == 0){
                 //Add
-                mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_client_id = $client_id");
+                mysqli_query($mysqli,"INSERT INTO locations SET location_name = '$name', location_description = '$description', location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_phone = '$phone', location_hours = '$hours', location_client_id = $client_id");
                 $row_count = $row_count + 1;
             }else{
                 $duplicate_count = $duplicate_count + 1;
@@ -336,7 +339,7 @@
     $f = fopen('php://memory', 'w');
 
     //set column headers
-    $fields = array('Name', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours');
+    $fields = array('Name', 'Description', 'Address', 'City', 'State', 'Postal Code', 'Phone', 'Hours');
     fputcsv($f, $fields, $delimiter);
 
     //move back to beginning of file
diff --git a/post/recurring_ticket_model.php b/post/recurring_ticket_model.php
index 88a445941..ae42ccb96 100644
--- a/post/recurring_ticket_model.php
+++ b/post/recurring_ticket_model.php
@@ -15,3 +15,8 @@
 if (isset($_POST['contact'])) {
     $contact_id = intval($_POST['contact']);
 }
+
+$assigned_to = "0";
+if (isset($_POST['assigned_to'])) {
+    $assigned_to = intval($_POST['assigned_to']);
+}
diff --git a/post/setting.php b/post/setting.php
index 78f933209..fa99eed19 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -184,10 +184,10 @@
     $mail = addToMailQueue($mysqli, $data);
 
     if ($mail === true) {
-        $_SESSION['alert_message'] = "Test email sent successfully";
+        $_SESSION['alert_message'] = "Test email queued successfully - Check Admin > Mail queue";
     } else {
         $_SESSION['alert_type'] = "error";
-        $_SESSION['alert_message'] = "Test email failed";
+        $_SESSION['alert_message'] = "Failed to add test mail to queue";
     }
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
diff --git a/post/ticket.php b/post/ticket.php
index 1967a7ad1..4fa8122d6 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -1206,7 +1206,7 @@
     exit;
 }
 
-if (isset($_POST['add_scheduled_ticket']) || isset($_POST['add_recurring_ticket'])) {
+if (isset($_POST['add_recurring_ticket'])) {
 
     validateTechRole();
 
@@ -1222,7 +1222,7 @@
     }
 
     // Add scheduled ticket
-    mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
+    mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id");
 
     $scheduled_ticket_id = mysqli_insert_id($mysqli);
 
@@ -1234,7 +1234,7 @@
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_POST['edit_scheduled_ticket']) || isset($_POST['edit_recurring_ticket'])) {
+if (isset($_POST['edit_recurring_ticket'])) {
 
     validateTechRole();
 
@@ -1251,7 +1251,7 @@
     }
 
     // Edit scheduled ticket
-    mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
+    mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id");
 
     // Logging
     mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Recurring Ticket', log_action = 'Modify', log_description = '$session_name modified recurring ticket for $subject - $frequency', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id");
diff --git a/post/user.php b/post/user.php
index 0b900cfbd..36f870ef0 100644
--- a/post/user.php
+++ b/post/user.php
@@ -207,6 +207,10 @@
 
     mysqli_query($mysqli, "UPDATE users SET user_status = 0 WHERE user_id = $user_id");
 
+    // Un-assign tickets
+    mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = 0 WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL");
+    mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_assigned_to = 0 WHERE scheduled_ticket_assigned_to = $user_id");
+
     //Logging
     mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'User', log_action = 'Modify', log_description = '$session_name disabled user $user_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $user_id");
 
diff --git a/recurring_ticket_add_modal.php b/recurring_ticket_add_modal.php
index adb787705..16e24bdb7 100644
--- a/recurring_ticket_add_modal.php
+++ b/recurring_ticket_add_modal.php
@@ -8,151 +8,189 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+                <?php if (isset($client_id)) { ?>
+                       <input type="hidden" name="client" value="<?php echo $client_id; ?>>">
+                <?php } ?>
+
                 <div class="modal-body bg-white">
-                    <?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>
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-add-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-add-contacts"><i class="fa fa-fw fa-users mr-2"></i>Contacts</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-add-schedule"><i class="fa fa-fw fa-building mr-2"></i>Schedule</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-add-assets"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</a>
+                        </li>
+                    </ul>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-add-details">
+
+                            <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>
-                                <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 AND contact_archived_at IS NULL ORDER BY contact_primary DESC, contact_technical DESC, contact_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $contact_id = intval($row['contact_id']);
-                                        $contact_name = nullable_htmlentities($row['contact_name']);
-                                        $contact_primary = intval($row['contact_primary']);
-                                        if ($contact_primary == 1) {
-                                            $contact_primary_display = " (Primary)";
-                                        } else {
-                                            $contact_primary_display = "";
-                                        }
-                                        $contact_technical = intval($row['contact_technical']);
-                                        if ($contact_technical == 1) {
-                                            $contact_technical_display = " (Technical)";
-                                        } else {
-                                            $contact_technical_display = "";
-                                        }
-                                        $contact_title = nullable_htmlentities($row['contact_title']);
-                                        if (!empty($contact_title)) {
-                                            $contact_title_display = " - $contact_title";
-                                        } else {
-                                            $contact_title_display = "";
-                                        }
-
-                                    ?>
-                                        <option value="<?php echo $contact_id; ?>" <?php if ($contact_primary == 1) {
-                                                                                        echo "selected";
-                                                                                    } ?>><?php echo "$contact_name$contact_title_display$contact_primary_display$contact_technical_display"; ?></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 class="form-group">
+                                <textarea class="form-control tinymce" 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>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="">- Client -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $selectable_client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-                                    ?>
-                                        <option value="<?php echo $selectable_client_id; ?>"><?php echo $client_name; ?></option>
-
-                                    <?php } ?>
-                                </select>
                             </div>
-                        </div>
-                    <?php } ?>
 
-                    <div class="form-group">
-                        <label>Frequency <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-recycle"></i></span>
+                            <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_settings on users.user_id = user_settings.user_id
+                                            WHERE user_role > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                        );
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $user_id = intval($row['user_id']);
+                                            $user_name = nullable_htmlentities($row['user_name']); ?>
+                                            <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
                             </div>
-                            <select class="form-control select2" name="frequency" required>
-                                <option>Weekly</option>
-                                <option>Monthly</option>
-                                <option>Quarterly</option>
-                                <option>Biannually</option>
-                                <option>Annually</option>
-                            </select>
+
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label>Starting date <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-calendar-day"></i></span>
+
+                        <div class="tab-pane fade" id="pills-add-contacts">
+
+                            <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" id="changeClientSelect" required <?php if (isset($client_id)) { echo "disabled"; } ?>>
+                                        <option value="">- Client -</option>
+                                        <?php
+
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                                        while ($row = mysqli_fetch_array($sql)) {
+                                            $selectable_client_id = intval($row['client_id']);
+                                            $client_name = nullable_htmlentities($row['client_name']); ?>
+
+                                            <option value="<?php echo $selectable_client_id; ?>" <?php if (isset($client_id) && $client_id == $selectable_client_id) {echo "selected"; } ?>><?php echo $client_name; ?></option>
+
+                                        <?php } ?>
+                                    </select>
+                                </div>
                             </div>
-                            <input class="form-control" type="date" name="start_date" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" required>
-                        </div>
-                    </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 class="form-group">
+                                <label>Contact </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" id="contactSelect" required>
+                                    </select>
+                                </div>
                             </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">
-                        <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 id="contacts-section">
+
                             </div>
-                            <input type="text" class="form-control" name="subject" placeholder="Subject" required>
+
                         </div>
-                    </div>
 
-                    <?php if (isset($client_id)) { ?>
+                        <div class="tab-pane fade" id="pills-add-schedule">
+
+                            <div class="form-group">
+                                <label>Frequency <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-recycle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="frequency" required>
+                                        <option>Weekly</option>
+                                        <option>Monthly</option>
+                                        <option>Quarterly</option>
+                                        <option>Biannually</option>
+                                        <option>Annually</option>
+                                    </select>
+                                </div>
+                            </div>
 
-                        <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 class="form-group">
+                                <label>Starting date <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-calendar-day"></i></span>
+                                    </div>
+                                    <input class="form-control" type="date" name="start_date" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" required>
                                 </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 AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-
-                                    while ($row = mysqli_fetch_array($sql_assets)) {
-                                        $asset_id_select = intval($row['asset_id']);
-                                        $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                    ?>
-                                        <option value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-
-                                    <?php } ?>
-                                </select>
                             </div>
+
                         </div>
 
-                    <?php } ?>
+                        <div class="tab-pane fade" id="pills-add-assets">
+
+                            <?php if (isset($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 AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+
+                                            while ($row = mysqli_fetch_array($sql_assets)) {
+                                                $asset_id_select = intval($row['asset_id']);
+                                                $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                                ?>
+                                                <option value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
+                        </div>
 
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="details"></textarea>
                     </div>
 
                 </div>
@@ -164,3 +202,8 @@
         </div>
     </div>
 </div>
+
+<!-- Recurring Ticket Client/Contact JS -->
+<link rel="stylesheet" href="plugins/jquery-ui/jquery-ui.min.css">
+<script src="plugins/jquery-ui/jquery-ui.min.js"></script>
+<script src="js/recurring_tickets_add_modal.js"></script>
diff --git a/recurring_ticket_edit_modal.php b/recurring_ticket_edit_modal.php
index d7a9717ef..e07f15ade 100644
--- a/recurring_ticket_edit_modal.php
+++ b/recurring_ticket_edit_modal.php
@@ -8,88 +8,136 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="scheduled_ticket_id" id="editTicketId">
+                <input type="hidden" name="client" id="editClientId">
+
                 <div class="modal-body bg-white">
-                    <input type="hidden" name="scheduled_ticket_id" id="editTicketId">
-                    <input type="hidden" name="client" id="editClientId">
-
-                    <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>
+
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-edit-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-edit-contacts"><i class="fa fa-fw fa-users mr-2"></i>Contacts</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-edit-schedule"><i class="fa fa-fw fa-building mr-2"></i>Schedule</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-edit-assets"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</a>
+                        </li>
+                    </ul>
+
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-edit-details">
+
+                            <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 id="editTicketSubject">
+                                </div>
                             </div>
-                            <select class="form-control select2" name="contact" id="editTicketContact" required>
-                                <option value="">- Contact -</option>
-                            </select>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label>Frequency <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-recycle"></i></span>
+                            <div class="form-group">
+                                <textarea class="form-control tinymce" name="details" id="editTicketDetails"></textarea>
                             </div>
-                            <!-- Not using select2 as couldn't get this working with Javascript modal population -->
-                            <select class="form-control" name="frequency" required id="editTicketFrequency">
-                                <option id="Weekly">Weekly</option>
-                                <option id="Monthly">Monthly</option>
-                                <option id="Quarterly">Quarterly</option>
-                                <option id="Biannually">Biannually</option>
-                                <option id="Annually">Annually</option>
-                            </select>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
-                        <label>Next run date <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-calendar-day"></i></span>
+                            <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>
+                                    <!-- Not using select2 as couldn't get this working with Javascript modal population -->
+                                    <select class="form-control" name="priority" required id="editTicketPriority">
+                                        <option id="Low">Low</option>
+                                        <option id="Medium">Medium</option>
+                                        <option id="High">High</option>
+                                    </select>
+                                </div>
                             </div>
-                            <input class="form-control" type="date" name="next_date" id="editTicketNextRun" max="2999-12-31">
+
+                            <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" id="editTicketAgent">
+                                        <option value="0">- Not Assigned -</option>
+                                    </select>
+                                </div>
+                            </div>
+
                         </div>
-                    </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 class="tab-pane fade" id="pills-edit-contacts">
+
+                            <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" id="editTicketContact" required>
+                                        <option value="">- Contact -</option>
+                                    </select>
+                                </div>
                             </div>
-                            <!-- Not using select2 as couldn't get this working with Javascript modal population -->
-                            <select class="form-control" name="priority" required id="editTicketPriority">
-                                <option id="Low">Low</option>
-                                <option id="Medium">Medium</option>
-                                <option id="High">High</option>
-                            </select>
+
                         </div>
-                    </div>
 
-                    <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 class="tab-pane fade" id="pills-edit-schedule">
+
+                            <div class="form-group">
+                                <label>Frequency <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-recycle"></i></span>
+                                    </div>
+                                    <!-- Not using select2 as couldn't get this working with Javascript modal population -->
+                                    <select class="form-control" name="frequency" required id="editTicketFrequency">
+                                        <option id="Weekly">Weekly</option>
+                                        <option id="Monthly">Monthly</option>
+                                        <option id="Quarterly">Quarterly</option>
+                                        <option id="Biannually">Biannually</option>
+                                        <option id="Annually">Annually</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Next run date <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-calendar-day"></i></span>
+                                    </div>
+                                    <input class="form-control" type="date" name="next_date" id="editTicketNextRun" max="2999-12-31">
+                                </div>
                             </div>
-                            <input type="text" class="form-control" name="subject" placeholder="Subject" required id="editTicketSubject">
+
                         </div>
-                    </div>
 
-                    <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 class="tab-pane fade" id="pills-edit-assets">
+
+                            <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" id="editTicketAssetId">
+                                        <option value="0">- None -</option>
+                                    </select>
+                                </div>
                             </div>
-                            <select class="form-control select2" name="asset" id="editTicketAssetId">
-                                <option value="0">- None -</option>
-                            </select>
+
                         </div>
-                    </div>
 
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="details" id="editTicketDetails"></textarea>
                     </div>
 
                 </div>
diff --git a/ticket.php b/ticket.php
index 8b7579d43..8f0dedd61 100644
--- a/ticket.php
+++ b/ticket.php
@@ -214,6 +214,7 @@
             "SELECT users.user_id, user_name FROM users
             LEFT JOIN user_settings on users.user_id = user_settings.user_id
             WHERE user_role > 1
+            AND user_status = 1
             AND user_archived_at IS NULL
             ORDER BY user_name ASC"
         );
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 79fe9745a..6d2c57bd7 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -48,7 +48,7 @@
                             <div class="form-group">
                                 <textarea class="form-control tinymceai" id="textInput" name="details"></textarea>
                             </div>
-                            
+
                             <div class="mb-3">
                                 <button id="rewordButton" class="btn btn-primary" type="button"><i class="fas fa-fw fa-robot mr-2"></i>Reword</button>
                                 <button id="undoButton" class="btn btn-secondary" type="button" style="display:none;"><i class="fas fa-fw fa-redo-alt mr-2"></i>Undo</button>
@@ -119,7 +119,7 @@
                                             $mysqli,
                                             "SELECT users.user_id, user_name FROM users
                                             LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                            WHERE user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                                            WHERE user_role > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
                                         );
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $user_id = intval($row['user_id']);
@@ -137,7 +137,7 @@
                             <div class="tab-pane fade" id="pills-contacts">
 
                                 <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                                
+
                                 <div class="form-group">
                                     <label>Contact</label>
                                     <div class="input-group">
@@ -169,7 +169,7 @@
                                                 } else {
                                                     $contact_title_display = "";
                                                 }
-                                                
+
                                                 ?>
                                                 <option value="<?php echo $contact_id; ?>" <?php if ($contact_primary == 1) { echo "selected"; } ?>><?php echo "$contact_name$contact_title_display$contact_primary_display$contact_technical_display"; ?></option>
 
diff --git a/ticket_bulk_assign_modal.php b/ticket_bulk_assign_modal.php
index 6393a351c..7934281e9 100644
--- a/ticket_bulk_assign_modal.php
+++ b/ticket_bulk_assign_modal.php
@@ -21,6 +21,7 @@
                             $sql_users_select = mysqli_query($mysqli, "SELECT * FROM users 
                                 LEFT JOIN user_settings on users.user_id = user_settings.user_id
                                 WHERE user_role > 1
+                                AND user_status = 1
                                 AND user_archived_at IS NULL 
                                 ORDER BY user_name DESC"
                             );