diff --git a/autoload/class.S.php b/autoload/class.S.php
index 71f27c9..d46dd16 100644
--- a/autoload/class.S.php
+++ b/autoload/class.S.php
@@ -1295,11 +1295,11 @@ class S
       if (self::email_check($replay))
       {
         $mail->AddReplyTo($replay, $replay);
-        $mail -> SetFrom( $settings['email_login'], $settings['contact_email']);
+        $mail -> SetFrom( $settings['email_login'], $settings['email_login'] );
       }
       else
       {
-        $mail->AddReplyTo($settings['contact_email'], $settings['firm_name']);
+        $mail->AddReplyTo( $settings['contact_email'], $settings['firm_name'] );
         $mail->SetFrom( $settings['email_login'], $settings['firm_name']);
       }