diff --git a/includes/email.php b/includes/email.php
index 0383bd2..9bdbcf9 100644
--- a/includes/email.php
+++ b/includes/email.php
@@ -12,8 +12,8 @@ class Email {
 
     public function __construct() {
         $this->apiKey    = getSetting('cybermail_api_key', defined('CYBERMAIL_API_KEY') ? CYBERMAIL_API_KEY : '');
-        $this->fromEmail = defined('SENDER_EMAIL') ? SENDER_EMAIL : 'noreply@tomsjavajive.com';
-        $this->fromName  = defined('SENDER_NAME')  ? SENDER_NAME  : "Tom's Java Jive";
+        $this->fromEmail = getSetting('cybermail_from_email', defined('SENDER_EMAIL') ? SENDER_EMAIL : 'noreply@tomsjavajive.com');
+        $this->fromName  = getSetting('cybermail_from_name',  defined('SENDER_NAME') ? SENDER_NAME : "Tom's Java Jive");
     }
 
     private function logEmail(string $to, string $subject, string $html, array $result, array $options = []): void {