diff --git a/client_tickets.php b/client_tickets.php
index d82d5757..400b6a88 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -162,10 +162,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <td>
                             <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
                         </td>
-                        <td><?php echo $contact_display; ?></td>
-                        <td><?php echo $ticket_priority_display; ?></td>
+                        <td><a href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>"><?php echo $contact_display; ?></a></td>
+                        <td><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><?php echo $ticket_priority_display; ?></a></td>
                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status; ?></span></td>
-                        <td><?php echo $ticket_assigned_to_display; ?></td>
+                        <td><a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a></td>
                         <td><?php echo $ticket_updated_at_display; ?></td>
                         <td>
                             <?php echo $ticket_created_at_time_ago; ?>
@@ -197,6 +197,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <?php
 
                     require("ticket_edit_modal.php");
+                    require("ticket_assign_modal.php");
+                    require("ticket_edit_priority_modal.php");
+                    require("ticket_edit_contact_modal.php");
                 }
 
                 ?>
diff --git a/post/ticket.php b/post/ticket.php
index b9b9398c..cf6afe9d 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -154,6 +154,45 @@ if (isset($_POST['edit_ticket'])) {
 
 }
 
+if (isset($_POST['edit_ticket_priority'])) {
+
+    validateTechRole();
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $priority = sanitizeInput($_POST['priority']);
+    $client_id = intval($_POST['client_id']);
+
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_priority = '$priority' WHERE ticket_id = $ticket_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name edited ticket priority', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id");
+
+    $_SESSION['alert_message'] = "Ticket priority updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_POST['edit_ticket_contact'])) {
+
+    validateTechRole();
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $contact_id = intval($_POST['contact']);
+    $client_id = intval($_POST['client_id']);
+    $ticket_number = sanitizeInput($_POST['ticket_number']);
+
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_contact_id = $contact_id WHERE ticket_id = $ticket_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name changed contact for ticket $ticket_number', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id");
+
+    $_SESSION['alert_message'] = "Ticket <strong>$ticket_number</strong> contact updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['assign_ticket'])) {
 
     // Role check
diff --git a/ticket_assign_modal.php b/ticket_assign_modal.php
new file mode 100644
index 00000000..98807a9a
--- /dev/null
+++ b/ticket_assign_modal.php
@@ -0,0 +1,47 @@
+<div class="modal" id="assignTicketModal<?php echo $ticket_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-user-check mr-2"></i>Assigning Ticket: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+                <input type="hidden" name="ticket_status" value="<?php echo $ticket_status; ?>">
+                <div class="modal-body bg-white">
+
+                    <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">No One</option>
+                                <?php
+                                $sql_users_select = mysqli_query($mysqli, "SELECT * FROM users WHERE user_archived_at IS NULL ORDER BY user_name DESC");
+                                while ($row = mysqli_fetch_array($sql_users_select)) {
+                                    $user_id_select = intval($row['user_id']);
+                                    $user_name_select = nullable_htmlentities($row['user_name']);
+                                    
+                                    ?>
+                                    <option value="<?php echo $user_id_select; ?>" <?php if ($user_id_select  == $ticket_assigned_to) { echo "selected"; } ?>><?php echo "$user_name_select"; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
diff --git a/ticket_edit_contact_modal.php b/ticket_edit_contact_modal.php
new file mode 100644
index 00000000..e22e1c22
--- /dev/null
+++ b/ticket_edit_contact_modal.php
@@ -0,0 +1,67 @@
+<div class="modal" id="editTicketContactModal<?php echo $ticket_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-user mr-2"></i>Changing contact: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="ticket_number" value="<?php echo "$ticket_prefix$ticket_number"; ?>">
+                <div class="modal-body bg-white">
+
+                    <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">
+                                <option value="">No One</option>
+                                <?php
+                                $sql_client_contacts_select = 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_client_contacts_select)) {
+                                    $contact_id_select = intval($row['contact_id']);
+                                    $contact_name_select = nullable_htmlentities($row['contact_name']);
+                                    $contact_primary_select = intval($row['contact_primary']);
+                                    if($contact_primary_select == 1) {
+                                        $contact_primary_display_select = " (Primary)";
+                                    } else {
+                                        $contact_primary_display_select = "";
+                                    }
+                                    $contact_technical_select = intval($row['contact_technical']);
+                                    if($contact_technical_select == 1) {
+                                        $contact_technical_display_select = " (Technical)";
+                                    } else {
+                                        $contact_technical_display_select = "";
+                                    }
+                                    $contact_title_select = nullable_htmlentities($row['contact_title']);
+                                    if(!empty($contact_title_select)) {
+                                        $contact_title_display_select = " - $contact_title_select";
+                                    } else {
+                                        $contact_title_display_select = "";
+                                    }
+                                    
+                                    ?>
+                                    <option value="<?php echo $contact_id_select; ?>" <?php if ($contact_id_select  == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name_select$contact_title_display_select$contact_primary_display_select$contact_technical_display_select"; ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                    </div>
+
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="edit_ticket_contact" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
diff --git a/ticket_edit_priority_modal.php b/ticket_edit_priority_modal.php
new file mode 100644
index 00000000..b0778bca
--- /dev/null
+++ b/ticket_edit_priority_modal.php
@@ -0,0 +1,41 @@
+<div class="modal" id="editTicketPriorityModal<?php echo $ticket_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-thermometer-half mr-2"></i>Editing ticket priority: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Priority</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 <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
+                                <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
+                                <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="edit_ticket_priority" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+
+            </form>
+
+        </div>
+    </div>
+</div>
diff --git a/tickets.php b/tickets.php
index e4a5d92a..9cab1e28 100644
--- a/tickets.php
+++ b/tickets.php
@@ -358,13 +358,13 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                 <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
                             </td>
                             <td>
-                                <a href="client_tickets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-                                <br>
-                                <?php echo $contact_display; ?>
+                                <a href="client_tickets.php?client_id=<?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong></a>
+                                
+                                <div class="mt-1"><a href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>"><?php echo $contact_display; ?></a></div>
                             </td>
-                            <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></td>
+                            <td><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></a></td>
                             <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status; ?></span></td>
-                            <td><?php echo $ticket_assigned_to_display; ?></td>
+                            <td><a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a></td>
                             <td><?php echo $ticket_updated_at_display; ?></td>
                             <td>
                                 <?php echo $ticket_created_at_time_ago; ?>
@@ -392,6 +392,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                 <?php }
 
                                 require("ticket_edit_modal.php");
+                                require("ticket_assign_modal.php");
+                                require("ticket_edit_priority_modal.php");
+                                require("ticket_edit_contact_modal.php");
 
                                 ?>
                             </td>