diff --git a/ajax.php b/ajax.php
index fb00ae9e..2d6dc6a0 100644
--- a/ajax.php
+++ b/ajax.php
@@ -285,7 +285,7 @@ if (isset($_GET['share_generate_link'])) {
         $body = "Hello,<br><br>$session_name from $session_company_name sent you a time sensitive encrypted link which will expire in <strong>$item_expires</strong> and may only be viewed <strong>$item_view_limit</strong> times, before the link is destroyed. The sender will receive a notification when the link is viewed. Please click the link below to view your shared secret<br><br><strong><a href='$url'>Click Here</a></strong><br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email";
 
         $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
-            $config_ticket_from_email, $config_ticket_from_name,
+            $config_mail_from_email, $config_mail_from_name,
             $item_email, $item_email,
             $subject, $body);
 
diff --git a/get_settings.php b/get_settings.php
index fc526b62..3e204f43 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -11,7 +11,7 @@ DEFINE("CURRENT_DATABASE_VERSION", $row['config_current_database_version']);
 $config_azure_client_id = $row['config_azure_client_id'];
 $config_azure_client_secret = $row['config_azure_client_secret'];
 
-// Mail
+// Mail - SMTP
 $config_smtp_host = $row['config_smtp_host'];
 $config_smtp_port = intval($row['config_smtp_port']);
 $config_smtp_encryption = $row['config_smtp_encryption'];
diff --git a/settings_mail.php b/settings_mail.php
index 1db6612a..9d5e3181 100644
--- a/settings_mail.php
+++ b/settings_mail.php
@@ -167,7 +167,7 @@ require_once("inc_all_settings.php"); ?>
         </div>
     </div>
 
-    <?php if (!empty($config_smtp_host) && !empty($config_smtp_port) && !empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_mail_from_email) && !empty($config_mail_from_name)) { ?>
+    <?php if (!empty($config_smtp_host) && !empty($config_smtp_port) && !empty($config_mail_from_email) && !empty($config_mail_from_name)) { ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
@@ -187,7 +187,7 @@ require_once("inc_all_settings.php"); ?>
 
     <?php } ?>
 
-    <?php if (!empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_imap_host) && !empty($config_imap_port)) { ?>
+    <?php if (!empty($config_imap_username) && !empty($config_imap_password) && !empty($config_imap_host) && !empty($config_imap_port)) { ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">