diff --git a/client_download_pdf_modal.php b/client_download_pdf_modal.php
index da046487..4344a699 100644
--- a/client_download_pdf_modal.php
+++ b/client_download_pdf_modal.php
@@ -7,13 +7,13 @@
                     <span>&times;</span>
                 </button>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
+            <form action="post.php" method="post" autocomplete="off" target="_blank">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
                     <ul class="list-group">
                         <div class="row">
                             <div class="col-sm-6">
-                                
+
                                 <li class="list-group-item">
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="contacts" name="export_contacts" value="1" checked>
@@ -98,7 +98,7 @@
                             </div>
 
                             <div class="col-sm-6">
-                                
+
                                 <li class="list-group-item">
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="scheduled_tickets" name="export_scheduled_tickets" value="1" checked>
@@ -170,7 +170,7 @@
                                         </label>
                                     </div>
                                 </li>
-                         
+
                             </div>
                         </div>
                     </ul>
diff --git a/guest_view_ticket.php b/guest_view_ticket.php
index 702cb712..2b0c0ff7 100644
--- a/guest_view_ticket.php
+++ b/guest_view_ticket.php
@@ -80,7 +80,7 @@ if ($ticket_row) {
                 <br>
                 <strong>Priority:</strong> <?php echo $ticket_priority ?>
                 <br>
-                <?php if (empty($ticket_closed_at)) { ?>
+                <?php if (!empty($ticket_assigned_to) && empty($ticket_closed_at)) { ?>
                     <strong>Assigned to: </strong> <?php echo $ticket_assigned_to ?>
                 <?php } ?>
             </p>
diff --git a/portal/contacts.php b/portal/contacts.php
index 66f7a3cb..f4f2a04f 100644
--- a/portal/contacts.php
+++ b/portal/contacts.php
@@ -17,8 +17,10 @@ $contacts_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_
 ?>
 
     <div class="row">
-        <h3>Contacts</h3>
-        <div class="col offset-7">
+        <div class="col">
+            <h3>Contacts</h3>
+        </div>
+        <div class="col offset-6">
             <a href="contact_add.php" class="btn btn-primary" role="button"><i class="fas fa-plus mr-2"></i>New Contact</a>
         </div>
     </div>
diff --git a/portal/ticket.php b/portal/ticket.php
index be059896..45a8a706 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -92,17 +92,20 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 <h5><strong>Subject:</strong> <?php echo $ticket_subject ?></h5>
                 <hr>
                 <p>
-                    <strong>State:</strong> <?php echo $ticket_status ?>
-                    <br>
-                    <strong>Priority:</strong> <?php echo $ticket_priority ?>
-                    <br>
+                    <strong>State:</strong> <?php echo $ticket_status ?><br>
+                    <strong>Priority:</strong> <?php echo $ticket_priority ?><br>
 
                     <?php if (empty($ticket_closed_at)) { ?>
+
                         <?php if ($task_count) { ?>
                             <strong>Tasks: </strong> <?php echo $completed_task_count . " / " .$task_count ?>
                             <br>
                         <?php } ?>
-                        <strong>Assigned to: </strong> <?php echo $ticket_assigned_to ?>
+
+                        <?php if (!empty($ticket_assigned_to)) { ?>
+                            <strong>Assigned to: </strong> <?php echo $ticket_assigned_to ?>
+                        <?php } ?>
+
                     <?php } ?>
                 </p>
                 <?php echo $ticket_details ?>
diff --git a/post/user/client.php b/post/user/client.php
index d9d451c4..9d0a93c3 100644
--- a/post/user/client.php
+++ b/post/user/client.php
@@ -129,7 +129,7 @@ if (isset($_POST['edit_client'])) {
     $sql = mysqli_query($mysqli, "SELECT category_name FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND category_name = '$referral'");
     if(mysqli_num_rows($sql) == 0) {
         mysqli_query($mysqli, "INSERT INTO categories SET category_name = '$referral', category_type = 'Referral'");
-        
+
         // Logging
         logAction("Category", "Create", "$session_name created referral category $referral");
     }
@@ -383,7 +383,7 @@ if (isset($_POST['export_clients_csv'])) {
 
         //output all remaining data on a file pointer
         fpassthru($f);
-        
+
         logAction("Client", "Export", "$session_name exported $num_rows client(s) to a CSV file");
 
     }
@@ -1937,9 +1937,14 @@ if (isset($_POST['export_client_pdf'])) {
         //pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09($client_name); ?>-IT_Documentation-<?php echo date('Y-m-d'); ?>');
         pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09($client_name); ?>-IT_Documentation-<?php echo date('Y-m-d'); ?>');
 
+        setTimeout(function(){
+            window.close();
+        }, 10000);
+
     </script>
 
 
+
     <?php
 
 }
diff --git a/post/user/ticket.php b/post/user/ticket.php
index 05b3b78b..4e8db736 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -295,39 +295,38 @@ if (isset($_POST['edit_ticket_contact'])) {
 
     // Get Original contact, and ticket details
     $sql = mysqli_query($mysqli, "SELECT 
-        contact_name, contact_email, ticket_prefix, ticket_number, ticket_status_name, ticket_client_id
+        contact_name, ticket_prefix, ticket_number, ticket_status_name, ticket_subject, ticket_details, ticket_url_key, ticket_client_id
         FROM tickets
         LEFT JOIN contacts ON ticket_contact_id = contact_id
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
         WHERE ticket_id = $ticket_id"
     );
     $row = mysqli_fetch_array($sql);
-    $original_contact_name = sanitizeInput($row['contact_name']);
-    $original_contact_email = sanitizeInput($row['contact_email']);
+
+    // Original contact
+    $original_contact_name = !empty($row['contact_name']) ? sanitizeInput($row['contact_name']) : 'No one';
+
+    // Ticket details
     $ticket_prefix = sanitizeInput($row['ticket_prefix']);
     $ticket_number = intval($row['ticket_number']);
     $ticket_status = sanitizeInput($row['ticket_status_name']);
-    $ticket_category = sanitizeInput($row['ticket_category']);
     $ticket_subject = sanitizeInput($row['ticket_subject']);
     $ticket_details = mysqli_escape_string($mysqli, $row['ticket_details']);
-    $ticket_priority = sanitizeInput($row['ticket_priority']);
-    $client_id = intval($row['ticket_client_id']);
-    $ticket_created_by = intval($row['ticket_created_by']);
-    $ticket_assigned_to = intval($row['ticket_assigned_to']);
     $url_key = sanitizeInput($row['ticket_url_key']);
     $client_id = intval($row['ticket_client_id']);
 
+    // Update the contact
     mysqli_query($mysqli, "UPDATE tickets SET ticket_contact_id = $contact_id WHERE ticket_id = $ticket_id");
 
     // Get New contact details
     $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email FROM contacts WHERE contact_id = $contact_id");
     $row = mysqli_fetch_array($sql);
 
-    $contact_name = sanitizeInput($row['contact_name']);
+    $contact_name = !empty($row['contact_name']) ? sanitizeInput($row['contact_name']) : 'No one';
     $contact_email = sanitizeInput($row['contact_email']);
 
-    // Notify new contact if selected
-    if ($notify && !empty($config_smtp_host)) {
+    // Notify new contact (if selected, valid & configured)
+    if ($notify && filter_var($contact_email, FILTER_VALIDATE_EMAIL) && !empty($config_smtp_host)) {
 
         // Get Company Phone Number
         $sql = mysqli_query($mysqli, "SELECT company_name, company_phone FROM companies WHERE company_id = 1");
@@ -344,18 +343,14 @@ if (isset($_POST['edit_ticket_contact'])) {
         $subject = "Ticket Created - [$ticket_prefix$ticket_number] - $ticket_subject";
         $body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: $ticket_status<br>Portal: <a href=\'https://$config_base_url/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>View ticket</a><br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
-
-        // Only add contact to email queue if email is valid
-        if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
-            $data[] = [
-                'from' => $config_ticket_from_email,
-                'from_name' => $config_ticket_from_name,
-                'recipient' => $contact_email,
-                'recipient_name' => $contact_name,
-                'subject' => $subject,
-                'body' => $body
-            ];
-        }
+        $data[] = [
+            'from' => $config_ticket_from_email,
+            'from_name' => $config_ticket_from_name,
+            'recipient' => $contact_email,
+            'recipient_name' => $contact_name,
+            'subject' => $subject,
+            'body' => $body
+        ];
 
         addToMailQueue($mysqli, $data);
     }
diff --git a/ticket.php b/ticket.php
index e080c662..87d73597 100644
--- a/ticket.php
+++ b/ticket.php
@@ -895,7 +895,7 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Tasks Card -->
                 <div class="card card-body">
 
-                    <?php if (empty($ticket_closed_at) && lookupUserPermission("module_support") >= 2) { ?>
+                    <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                         <form action="post.php" method="post" autocomplete="off">
                             <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
                             <div class="form-group">
@@ -934,7 +934,7 @@ if (isset($_GET['ticket_id'])) {
                                 <td><span class="text-secondary"><?php echo $task_completion_estimate; ?>m</span> - <?php echo $task_name; ?></td>
                                 <td>
                                     <div class="float-right">
-                                        <?php if (empty($ticket_closed_at) && lookupUserPermission("module_support") >= 2) { ?>
+                                        <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
                                             <div class="dropdown dropleft text-center">
                                                 <button class="btn btn-link text-secondary btn-sm" type="button" data-toggle="dropdown">
                                                     <i class="fas fa-fw fa-ellipsis-v"></i>