diff --git a/sites/all/modules/forward/forward.module b/sites/all/modules/forward/forward.module
index 60506c8..b521186 100644
--- a/sites/all/modules/forward/forward.module
+++ b/sites/all/modules/forward/forward.module
@@ -687,10 +687,12 @@ function forward_form(&$form_state, $path = NULL, $title = NULL, $nodeapi = FALS
   }
 
   if ($user->uid != 0) {
-    //$form['message']['email']['#default_value'] = $user->mail;
-    //$form['message']['email']['#disabled'] = TRUE;
-    $form['message']['email']['#type'] = 'hidden';
-    $form['message']['email']['#value'] = $user->mail;
+    if (user_access('override email address')) {
+      $form['message']['email']['#default_value'] = $user->mail;
+    } else {
+      $form['message']['email']['#type'] = 'hidden';
+      $form['message']['email']['#value'] = $user->mail;
+    }
     $form['message']['name']['#default_value'] = $user->name;
   }