diff --git a/includes/SpecialContact.php b/includes/SpecialContact.php
index 60a1adb..d444158 100644
--- a/includes/SpecialContact.php
+++ b/includes/SpecialContact.php
@@ -284,11 +284,11 @@ class SpecialContact extends UnlistedSpecialPage
             $senderAddress = $contactSender;
         } else {
             // Use user submitted details
-            $senderAddress = new MailAddress($this->getConfig()->get('PasswordSender'), $config['SenderName']);
-            if ($this->getConfig()->get('UserEmailUseReplyTo')) {
+            $senderAddress = new MailAddress($fromAddress, $fromName);
+            // if ($this->getConfig()->get('UserEmailUseReplyTo')) {
                 // Define reply-to address
                 $replyTo = $senderAddress;
-            }
+            // }
         }
 
         $subject = $formData['Subject'];