diff --git forward.module forward.module
index b2c3f3c..53208ca 100644
--- forward.module
+++ forward.module
@@ -1,5 +1,5 @@
 <?php
-/* $Id$ */
+/* $Id: forward.module,v 1.105 2010/09/15 14:25:14 seanr Exp $ */
 
 /**
  * @file
@@ -208,7 +208,7 @@ function forward_admin_settings($form, &$form_state) {
   $form['forward_options']['forward_sender_address'] = array(
     '#type' => 'textfield',
     '#title' => t('From address'),
-    '#default_value' => variable_get('forward_sender_address', variable_get('site_mail', '')),
+    '#default_value' => variable_get('forward_sender_address', ''),
     '#size' => 40,
     '#maxlength' => 40,
     '#description' => t('If left blank, the from address entered in the form will be used as the from address for the email.  Enter a valid email address here to override that.  The sender\'s email will still appear in the body of the message.'),
@@ -875,7 +875,7 @@ function forward_form_submit($form, &$form_state) {
 
   $from = variable_get('forward_sender_address', '');
   if (empty($from)) {
-    $from = variable_get('site_mail', '');
+    $from = $form_state['values']['email'];
   }
 
   $params['from'] = trim(mime_header_encode($form_state['values']['name']) . ' <' . $from . '>');