diff --git a/mimemail.module b/mimemail.module
index c68c72b..4457061 100644
--- a/mimemail.module
+++ b/mimemail.module
@@ -238,12 +238,15 @@ function mimemail_prepare_message($message) {
   $site_name = variable_get('site_name', 'Drupal');
   $site_mail = variable_get('site_mail', ini_get('sendmail_from'));
 
+  $mimemail_name = variable_get('mimemail_name', $site_name);
+  $mimemail_mail = variable_get('mimemail_mail', $site_mail);
+
   // Override site mails default sender when using default engine.
   if ((empty($from) || $from == $site_mail)
       && variable_get('mimemail_engine', 'mimemail') == 'mimemail') {
     $from = array(
-      'name' => variable_get('mimemail_name', $site_name),
-      'mail' => variable_get('mimemail_mail', $site_mail),
+      'name' => !empty($mimemail_name) ? $mimemail_name : $site_name,
+      'mail' => !empty($mimemail_mail) ? $mimemail_mail : $site_mail,
     );
   }