diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index a8ca8609..62ed47ea 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -37,6 +37,30 @@
           </div>
           <?php } ?>
 
+          <div class="form-group">
+            <label>Assigned to</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="assigned_to">
+                <option value="">Not Assigned</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM users, permissions WHERE users.user_id = permissions.user_id AND $session_company_id IN($session_permission_companies) ORDER BY name ASC");
+                while($row = mysqli_fetch_array($sql)){
+                  $user_id = $row['user_id'];
+                  $name = $row['name'];
+                ?>
+                <option value="<?php echo $user_id; ?>"><?php echo $name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Priority <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/client_tickets.php b/client_tickets.php
index 2bdc4ff1..7aa77335 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -120,6 +120,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }else{
               $ticket_priority_display = "-";
             }
+            $ticket_assigned_to = $row['ticket_assigned_to'];
+            if(empty($ticket_assigned_to)){
+              $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
+            }else{
+              $sql_assigned_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id = $ticket_assigned_to");
+              $row = mysqli_fetch_array($sql_assigned_to);
+              $ticket_assigned_to_display = $row['name'];
+            }
 
           ?>
 
@@ -128,7 +136,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $ticket_priority_display; ?></td>
             <td><?php echo $ticket_status_display; ?></td>
             <td><?php echo $ticket_subject; ?></td>
-            <td>- UNASSIGNED -</td>
+            <td><?php echo $ticket_assigned_to_display; ?></td>
             <td><?php echo $ticket_updated_at_display; ?></td>
             <td><?php echo $ticket_created_at; ?></td>
             <td>
diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index c49bf76e..0602e65a 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -11,6 +11,30 @@
         <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
         <div class="modal-body bg-white">
         
+          <div class="form-group">
+            <label>Assigned to</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="assigned_to">
+                <option value="">Not Assigned</option>
+                <?php 
+                
+                $sql_assign_to_select = mysqli_query($mysqli,"SELECT * FROM users, permissions WHERE users.user_id = permissions.user_id AND $session_company_id IN($session_permission_companies) ORDER BY name ASC");
+                while($row = mysqli_fetch_array($sql_assign_to_select)){
+                  $user_id = $row['user_id'];
+                  $name = $row['name'];
+                ?>
+                <option <?php if($ticket_assigned_to == $user_id){ echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Priority <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/post.php b/post.php
index 1e16d119..2a8652f0 100644
--- a/post.php
+++ b/post.php
@@ -1008,6 +1008,7 @@ if(isset($_GET['delete_event'])){
 if(isset($_POST['add_ticket'])){
 
     $client_id = intval($_POST['client']);
+    $assigned_to = intval($_POST['assigned_to']);
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
@@ -1017,7 +1018,7 @@ if(isset($_POST['add_ticket'])){
     $new_config_ticket_next_number = $config_ticket_next_number + 1;
     mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = $session_company_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 = 'Open', ticket_created_at = NOW(), ticket_created_by = $session_user_id, client_id = $client_id, company_id = $session_company_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 = 'Open', ticket_created_at = NOW(), ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, client_id = $client_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = '$subject', log_created_at = NOW(), client_id = $client_id, company_id = $session_company_id, user_id = $session_user_id");
@@ -1031,11 +1032,12 @@ if(isset($_POST['add_ticket'])){
 if(isset($_POST['edit_ticket'])){
 
     $ticket_id = intval($_POST['ticket_id']);
+    $assigned_to = intval($_POST['assigned_to']);
     $subject = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject'])));
     $priority = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['priority'])));
     $details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
 
-    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_updated_at = NOW() WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_subject = '$subject', ticket_priority = '$priority', ticket_details = '$details', ticket_updated_at = NOW(), ticket_assigned_to = $assigned_to WHERE ticket_id = $ticket_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modified', log_description = '$subject', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/ticket.php b/ticket.php
index 32c5d0cc..f5f2e11e 100644
--- a/ticket.php
+++ b/ticket.php
@@ -64,6 +64,15 @@ if(isset($_GET['ticket_id'])){
     $ticket_priority_display = "-";
   }
 
+  $ticket_assigned_to = $row['ticket_assigned_to'];
+  if(empty($ticket_assigned_to)){
+    $ticket_assigned_to_display = "<span class='text-danger'>Not Assigned</span>";
+  }else{
+    $sql_assigned_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id = $ticket_assigned_to");
+    $row = mysqli_fetch_array($sql_assigned_to);
+    $ticket_assigned_to_display = $row['name'];
+  }
+
 ?>
 
 <!-- Breadcrumbs-->
@@ -174,19 +183,8 @@ if(isset($_GET['ticket_id'])){
     <div class="card card-body mb-3"> 
       <h4 class="text-secondary">Details</h4>
       <div class="ml-1"><i class="fa fa-fw fa-thermometer-half text-secondary mr-2 mb-2"></i> <?php echo $ticket_priority_display; ?></div>
-      <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $name; ?></div>
+      <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $ticket_assigned_to_display; ?></div>
       <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
-      <form>
-      	<select class="form-control select2" name="assigned_to">
-      	<?php
-      	$sql_assign_to = mysqli_query($mysqli,"SELECT * FROM users, permissions WHERE users.user_id = permissions.user_id AND $session_company_id IN($session_permission_companies)");
-      	while($row = mysqli_fetch_array($sql_assign_to)){;
-		      $user_id = $row['user_id'];
-		      $name = $row['name'];
-		     ?>
-		     <option value="<?php echo $user_id; ?>"><?php echo $name; ?></option>
-		    <?php } ?>
-		    </select>
     </div>
 
     <?php
diff --git a/tickets.php b/tickets.php
index 00ade04e..b389ffa4 100644
--- a/tickets.php
+++ b/tickets.php
@@ -208,6 +208,14 @@
             }else{
               $ticket_priority_display = "-";
             }
+            $ticket_assigned_to = $row['ticket_assigned_to'];
+            if(empty($ticket_assigned_to)){
+              $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
+            }else{
+              $sql_assigned_to = mysqli_query($mysqli,"SELECT * FROM users WHERE user_id = $ticket_assigned_to");
+              $row = mysqli_fetch_array($sql_assigned_to);
+              $ticket_assigned_to_display = $row['name'];
+            }
 
           ?>
 
@@ -218,7 +226,7 @@
             
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $client_name; ?></a></td>
             <td><?php echo $ticket_subject; ?></td>
-            <td>- UNASSIGNED -</td>
+            <td><?php echo $ticket_assigned_to_display; ?></td>
             <td><?php echo $ticket_updated_at_display; ?></td>
             <td><?php echo $ticket_created_at; ?></td>
             <td>