Index: pages/login/LoginHandler.inc.php
===================================================================
RCS file: /cvs/ojs2/pages/login/Attic/LoginHandler.inc.php,v
retrieving revision 1.26.2.4
diff -u -r1.26.2.4 LoginHandler.inc.php
--- pages/login/LoginHandler.inc.php	1 May 2009 17:50:10 -0000	1.26.2.4
+++ pages/login/LoginHandler.inc.php	1 May 2009 17:53:28 -0000
@@ -250,7 +250,7 @@
 			$mail =& new MailTemplate('PASSWORD_RESET');
 
 			// Set the sender based on the current context
-			if ($journal) {
+			if ($journal && $journal->getSetting('supportEmail')) {
 				$mail->setFrom($journal->getSetting('supportEmail'), $journal->getSetting('supportName'));
 			} else {
 				$mail->setFrom($site->getSiteContactEmail(), $site->getSiteContactName());