diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index 453945c3..ac486a20 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -105,11 +105,11 @@
                 <option value="">- Client -</option>
                 <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
+                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
-                  $client_email = $row['client_email'];
+                  $contact_email = $row['contact_email'];
                 ?>
                   <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
                 
@@ -122,10 +122,10 @@
             
           <?php } ?>
 
-          <?php if(!empty($config_smtp_host) AND !empty($contact_email)){ ?>
+          <?php if(!empty($config_smtp_host)){ ?>
           <div class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing">Email Event (<?php echo $contact_email; ?>)</label>
+            <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
           </div>
           <?php } ?>
 
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index 350e74da..6cf4d1eb 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -104,10 +104,11 @@
                 <option value="">- Client -</option>
                 <?php 
                 
-                $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
+                $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
                 while($row = mysqli_fetch_array($sql_clients)){
                   $client_id_select = $row['client_id'];
                   $client_name_select = $row['client_name'];
+                  $contact_email_select = $row['contact_email'];
                 ?>
                   <option <?php if($client_id == $client_id_select){ echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
                 
@@ -120,10 +121,10 @@
 
           <?php } ?>
 
-          <?php if(!empty($config_smtp_host) AND !empty($client_email)){ ?>
+          <?php if(!empty($config_smtp_host)){ ?>
           <div class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event (<?php echo $client_email; ?>)</label>
+            <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
           </div>
           <?php } ?>
 
diff --git a/calendar_events.php b/calendar_events.php
index 333aa21a..a25a423b 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -16,7 +16,7 @@ if(isset($_GET['calendar_id'])){
   
   include("calendar_event_add_modal.php");
   include("calendar_add_modal.php");
-  include("add_quick_modal.php");
+  include("category_quick_add_modal.php");
 
 ?>
 
diff --git a/campaign.php b/campaign.php
index a7e5edac..946679b3 100644
--- a/campaign.php
+++ b/campaign.php
@@ -238,7 +238,7 @@ if(isset($_GET['campaign_id'])){
 
 <?php
 
-include("campaign_copy_modal.php");
+//include("campaign_copy_modal.php"); --Doesnt Exist Yet
 include("campaign_edit_modal.php");
 include("campaign_test_modal.php");
 
diff --git a/campaigns.php b/campaigns.php
index 65d00b92..19faebd2 100644
--- a/campaigns.php
+++ b/campaigns.php
@@ -242,7 +242,7 @@
 
           <?php
 
-          include("campaign_copy_modal.php");
+          //include("campaign_copy_modal.php"); --doesnt exist yet
           include("campaign_edit_modal.php");
           include("campaign_test_modal.php");
           
diff --git a/revenues.php b/revenues.php
index bc15203a..be1aa1c3 100644
--- a/revenues.php
+++ b/revenues.php
@@ -224,7 +224,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 <?php 
 
   include("revenue_add_modal.php");
-  include("add_quick_modal.php");
+  include("category_quick_add_modal.php");
 
   include("footer.php");