Index: pages/login/LoginHandler.inc.php =================================================================== RCS file: /cvs/ojs2/pages/login/Attic/LoginHandler.inc.php,v retrieving revision 1.26.2.1 diff -u -r1.26.2.1 LoginHandler.inc.php --- pages/login/LoginHandler.inc.php 18 Feb 2009 18:40:11 -0000 1.26.2.1 +++ pages/login/LoginHandler.inc.php 5 Mar 2009 18:25:30 -0000 @@ -178,7 +178,7 @@ $mail =& new MailTemplate('PASSWORD_RESET_CONFIRM'); // Set the sender based on the current context - if ($journal) { + if ($journal && $journal->getSetting('supportEmail')) { $email->setFrom($journal->getSetting('supportEmail'), $journal->getSetting('supportName')); } else { $mail->setFrom($site->getSiteContactEmail(), $site->getSiteContactName());