diff --git a/client_events.php b/client_events.php
index 9ea0c2b8..b39ba7cd 100644
--- a/client_events.php
+++ b/client_events.php
@@ -10,6 +10,7 @@ if (isset($_GET['calendar_id'])) {
 
 <link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />
 
+<!-- So that when hovering over a created event it turns into a hand instead of cursor -->
 <style>
     .fc-event {
         cursor: pointer;
diff --git a/models/client_logins.php b/models/client_logins.php
index 0652008a..ed228915 100644
--- a/models/client_logins.php
+++ b/models/client_logins.php
@@ -3,8 +3,8 @@ $client_id = intval($_POST['client_id']);
 $name = sanitizeInput($_POST['name']);
 $description = sanitizeInput($_POST['description']);
 $uri = preg_replace("(^https?://)", "", sanitizeInput($_POST['uri']));
-$username = encryptLoginEntry($_POST['username']);
-$password = encryptLoginEntry($_POST['password']);
+$username = encryptLoginEntry(trim($_POST['username']));
+$password = encryptLoginEntry(trim($_POST['password']));
 $otp_secret = sanitizeInput($_POST['otp_secret']);
 $note = sanitizeInput($_POST['note']);
 $important = intval($_POST['important']);
diff --git a/post.php b/post.php
index 348b5202..5b61cb70 100644
--- a/post.php
+++ b/post.php
@@ -4061,10 +4061,6 @@ if(isset($_GET['email_invoice'])){
     $contact_name_escaped = sanitizeInput($row['contact_name']);
     $contact_email = $row['contact_email'];
     $contact_email_escaped = sanitizeInput($row['contact_email']);
-    $contact_phone = formatPhoneNumber($row['contact_phone']);
-    $contact_extension = $row['contact_extension'];
-    $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-    $client_website = $row['client_website'];
 
     $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1");
     $row = mysqli_fetch_array($sql);
@@ -4103,8 +4099,8 @@ if(isset($_GET['email_invoice'])){
     // Get Email ID for reference
     $email_id = mysqli_insert_id($mysqli);
 
-    $_SESSION['alert_message'] = "Invoice has been sent to the mail queue";
-    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Queued', history_description = 'Invoice sent to the mail queue ID: $email_id', history_invoice_id = $invoice_id");
+    $_SESSION['alert_message'] = "Invoice has been sent";
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice sent to the mail queue ID: $email_id', history_invoice_id = $invoice_id");
 
     // Don't change the status to sent if the status is anything but draft
     if($invoice_status == 'Draft'){
@@ -4112,7 +4108,7 @@ if(isset($_GET['email_invoice'])){
     }
 
     // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Email Queue', log_description = 'Invoice $invoice_prefix$invoice_number queued to $contact_email_escaped Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $invoice_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Email', log_description = 'Invoice $invoice_prefix$invoice_number queued to $contact_email_escaped Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $invoice_id");
 
     // Send copies of the invoice to any additional billing contacts
     $sql_billing_contacts = mysqli_query(
@@ -4133,6 +4129,9 @@ if(isset($_GET['email_invoice'])){
         // Get Email ID for reference
         $email_id = mysqli_insert_id($mysqli);
 
+        // Logging
+        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Email', log_description = 'Invoice $invoice_prefix$invoice_number queued to $billing_contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $invoice_id");
+
     }
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);