diff --git a/post/project.php b/post/project.php
index 1327be12..2750c086 100644
--- a/post/project.php
+++ b/post/project.php
@@ -146,25 +146,32 @@ if (isset($_POST['add_project_ticket'])) {
 
     validateTechRole();
     $project_id = intval($_POST['project_id']);
-    $ticket_id = intval($_POST['ticket_id']);
 
     // Get Project Name
     $sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id");
     $row = mysqli_fetch_array($sql);
     $client_id = intval($row['project_client_id']);
     $project_name = sanitizeInput($row['project_name']);
-
-    // Get Ticket Info
-    $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id");
-    $row = mysqli_fetch_array($sql);
-    $ticket_subject = sanitizeInput($row['ticket_subject']);
     
-    mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
+    // Add Tickets
+    if (!empty($_POST['tickets'])) {
+        foreach ($_POST['tickets'] as $ticket) {
+            $ticket_id = intval($ticket);
+        
+            // Get Ticket Info
+            $sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id");
+            $row = mysqli_fetch_array($sql);
+            $ticket_subject = sanitizeInput($row['ticket_subject']);
+            
+            mysqli_query($mysqli, "UPDATE tickets SET ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
 
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project', log_action = 'Edit', log_description = '$session_name added a ticket $ticket_subject to project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id");
+            // Logging
+            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Project', log_action = 'Edit', log_description = '$session_name added a ticket $ticket_subject to project $project_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $project_id");
 
-    $_SESSION['alert_message'] = "You added Ticket <strong>$ticket_subject</strong> to <strong>$project_name</strong>";
+        }
+    }
+
+    $_SESSION['alert_message'] = "You added Tickets to <strong>$project_name</strong>";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
\ No newline at end of file
diff --git a/project_add_modal.php b/project_add_modal.php
index a9d06f41..8e7fbc49 100644
--- a/project_add_modal.php
+++ b/project_add_modal.php
@@ -90,13 +90,13 @@
 
                     <?php if (empty($_GET['client_id'])) { ?>
                     <div class="form-group">
-                        <label>Client <strong class="text-danger">*</strong></label>
+                        <label>Client</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
                             </div>
-                            <select class="form-control select2" name="client_id" required>
-                                <option value="">- Client -</option>
+                            <select class="form-control select2" name="client_id">
+                                <option vlaue="0">- No Client -</option>
                                 <?php
                                 $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
                                 while ($row = mysqli_fetch_array($sql)) {
diff --git a/project_details.php b/project_details.php
index 861239e3..d848b9ce 100644
--- a/project_details.php
+++ b/project_details.php
@@ -35,6 +35,11 @@ if (isset($_GET['project_id'])) {
 
     $client_id = intval($row['client_id']);
     $client_name = nullable_htmlentities($row['client_name']);
+    if ($client_name) {
+        $client_name_display = "<div class='text-secondary'><i class='fas fa-fw fa-users mr-2'></i>$client_name</div>";
+    } else {
+        $client_name_display = "";
+    }
 
     $project_manager = intval($row['user_id']);
     $project_manager_name = nullable_htmlentities($row['user_name']);
@@ -137,21 +142,16 @@ if (isset($_GET['project_id'])) {
             </div>
         </div>
         <div class="col-sm-3">
-            <div class="media">
-                <i class="fa fa-fw fa-2x fa-users text-secondary mr-3"></i>
-                <div class="media-body">
-                    <h3 class="mb-0"><?php echo $client_name; ?></h3>
-                    <?php echo $project_manager_display; ?>
-                    <div class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i><?php echo $project_due; ?></div>
-                    <?php echo $project_completed_date_display; ?>
-                    <!-- Time tracking -->
-                    <?php if ($ticket_total_reply_time) { ?>
-                        <div>
-                            <i class="far fa-fw fa-clock text-secondary mr-2"></i>Total time worked: <?php echo $ticket_total_reply_time; ?>
-                        </div>
-                    <?php } ?>
-                </div>
+            <div><?php echo $client_name_display; ?></div>
+            <div><?php echo $project_manager_display; ?></div>
+            <div class='text-secondary'><i class='fa fa-fw fa-clock mr-2'></i><?php echo $project_due; ?></div>
+            <div><?php echo $project_completed_date_display; ?></div>
+            <!-- Time tracking -->
+            <?php if ($ticket_total_reply_time) { ?>
+            <div>
+                <i class="far fa-fw fa-clock text-secondary mr-2"></i>Total time worked: <?php echo $ticket_total_reply_time; ?>
             </div>
+            <?php } ?>
         </div>
 
         <div class="col-sm-3">
diff --git a/project_ticket_add_modal.php b/project_ticket_add_modal.php
index 33c13b6b..f6172c57 100644
--- a/project_ticket_add_modal.php
+++ b/project_ticket_add_modal.php
@@ -17,16 +17,18 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
                             </div>
-                            <select class="form-control select2" name="ticket_id" required>
-                                <option value="">- Select a Ticket -</option>
+                            <select class="form-control select2" multiple name="tickets[]" required>
+                                <option value="">- Select a Tickets -</option>
                                 <?php
 
-                                $sql_tickets_select = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id != $project_id AND ticket_client_id = $client_id AND ticket_closed_at IS NULL");
+                                $sql_tickets_select = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = 0 AND ticket_closed_at IS NULL");
                                 while ($row = mysqli_fetch_array($sql_tickets_select)) {
                                     $ticket_id_select = intval($row['ticket_id']);
+                                    $ticket_prefix_select = nullable_htmlentities($row['ticket_prefix']);
+                                    $ticket_number_select = intval($row['ticket_number']);
                                     $ticket_subject_select = nullable_htmlentities($row['ticket_subject']);
                                     ?>
-                                    <option value="<?php echo $ticket_id_select; ?>"><?php echo $ticket_subject_select; ?></option>
+                                    <option value="<?php echo $ticket_id_select; ?>"><?php echo "$ticket_prefix_select $ticket_number_select - $ticket_subject_select"; ?></option>
                                     <?php
                                 }
 
diff --git a/projects.php b/projects.php
index 523fbb88..0137660c 100644
--- a/projects.php
+++ b/projects.php
@@ -23,7 +23,7 @@ if($status == 1) {
 // Ticket client access snippet
 $project_permission_snippet = '';
 if (!empty($client_access_string)) {
-    $project_permission_snippet = "AND project_client_id IN ($client_access_string)";
+    $project_permission_snippet = "AND project_client_id IN ($client_access_string) OR project_client_id = 0";
 }
 
 //Rebuild URL
@@ -146,6 +146,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         $client_id = intval($row['client_id']);
                         $client_name = nullable_htmlentities($row['client_name']);
+                        if ($client_name) {
+                            $client_name_display = "<a href='client_tickets.php?client_id=$client_id'>$client_name</a>";
+                        } else {
+                            $client_name_display = "-";
+                        }
 
                         $project_manager = intval($row['user_id']);
                         if ($project_manager) {
@@ -229,11 +234,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo $project_completed_at_display; ?></td>
                             <?php } ?>
                             <td><?php echo $project_manager_display; ?></td>
-                            <td>
-                                <a href="client_tickets.php?client_id=<?php echo $client_id; ?>">
-                                    <?php echo $client_name; ?>
-                                </a>
-                            </td>
+                            <td><?php echo $client_name_display; ?></td>
                             <td><?php echo $project_created_at_display; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">