diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index 1b584592..507cb496 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -70,6 +70,30 @@
 
           <?php } ?>
 
+          <div class="form-group">
+            <label>Client 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 client_id = $client_id ORDER BY contact_name ASC");
+                while($row = mysqli_fetch_array($sql_client_contacts_select)){
+                  $contact_id_select = $row['contact_id'];
+                  $contact_name_select = $row['contact_name'];
+                ?>
+                <option <?php if($contact_id_select == $contact_id){ echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <textarea class="form-control summernote" rows="8" name="details" required><?php echo $ticket_details; ?></textarea>
           </div>
diff --git a/post.php b/post.php
index 8e4d6a4e..05451898 100644
--- a/post.php
+++ b/post.php
@@ -1033,11 +1033,12 @@ if(isset($_POST['edit_ticket'])){
 
     $ticket_id = intval($_POST['ticket_id']);
     $assigned_to = intval($_POST['assigned_to']);
+    $contact_id = intval($_POST['contact']);
     $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(), ticket_assigned_to = $assigned_to 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, contact_id = $contact_id 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 7d28e940..23de836a 100644
--- a/ticket.php
+++ b/ticket.php
@@ -64,6 +64,25 @@ if(isset($_GET['ticket_id'])){
     $ticket_priority_display = "-";
   }
 
+  $contact_id = $row['contact_id'];
+  if(!empty($contact_id)){
+    $sql_contact = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_id = $contact_id");
+    $row = mysqli_fetch_array($sql_contact);
+    $contact_name = $row['contact_name'];
+    $contact_title = $row['contact_title'];
+    $contact_email = $row['contact_email'];
+    $contact_phone = $row['contact_phone'];
+    $contact_extension = $row['contact_extension'];
+    $contact_mobile = $row['contact_mobile'];
+    $location_id = $row['location_id'];
+    if(!empty($location_id)){
+      $sql_location = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_id = $location_id");
+      $row = mysqli_fetch_array($sql_location);
+      $location_name = $row['location_name'];
+    }
+  }
+
+
   $ticket_assigned_to = $row['ticket_assigned_to'];
   if(empty($ticket_assigned_to)){
     $ticket_assigned_to_display = "<span class='text-danger'>Not Assigned</span>";
@@ -131,8 +150,8 @@ if(isset($_GET['ticket_id'])){
                 <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
               </div>
               <select class="form-control select2" name="status" required>
-                <option <?php if($ticket_stataus == 'Open'){ echo "selected"; } ?> >Open</option>
-                <option <?php if($ticket_stataus == 'Working'){ echo "selected"; } ?> >Working</option>
+                <option <?php if($ticket_status == 'Open'){ echo "selected"; } ?> >Open</option>
+                <option <?php if($ticket_status == 'Working'){ echo "selected"; } ?> >Working</option>
                 <option <?php if($ticket_status == 'On Hold'){ echo "selected"; } ?> >On Hold</option>
                 <option <?php if($ticket_status == 'Closed'){ echo "selected"; } ?> >Closed</option>
               </select>
@@ -223,6 +242,52 @@ if(isset($_GET['ticket_id'])){
       </div>
     </div>
 
+    <?php if(!empty($contact_id)){ ?>
+
+    <div class="card mb-3">
+      <div class="card-body">
+        <div>  
+          <h4 class="text-secondary">Contact</h4>
+          <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_name; ?>
+          <br>
+          <?php
+          if(!empty($location_name)){
+          ?>
+          <i class="fa fa-fw fa-map-marker-alt text-secondary ml-1 mr-2 mb-2"></i> <?php echo $location_name; ?>
+          <br>
+          <?php
+          }
+          ?>
+          <?php
+          if(!empty($contact_email)){
+          ?>
+          <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
+          <br>
+          <?php
+          }
+          ?>
+          <?php
+          if(!empty($contact_phone)){
+          ?>
+          <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_phone; ?>
+          <br>
+          <?php 
+          } 
+          ?>
+          <?php
+          if(!empty($contact_mobile)){
+          ?>
+          <i class="fa fa-fw fa-mobile text-secondary ml-1 mr-2 mb-2"></i> <?php echo $contact_mobile; ?>
+          <br>
+          <?php 
+          } 
+          ?>
+        </div>
+      </div>
+    </div>
+
+    <?php } ?>
+
     <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>