--- loncom/interface/resetpw.pm	2012/02/14 15:48:55	1.23.2.2.2.3
+++ loncom/interface/resetpw.pm	2012/02/17 03:28:25	1.23.2.2.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.23.2.2.2.3 2012/02/14 15:48:55 raeburn Exp $
+# $Id: resetpw.pm,v 1.23.2.2.2.4 2012/02/17 03:28:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,9 +66,13 @@ sub handler {
         return OK;
     }
     my $contact_name = &mt('LON-CAPA helpdesk');
-    my $contact_email =  $r->dir_config('lonSupportEMail');
+    my $origmail = $r->dir_config('lonSupportEMail');
     my $server = $r->dir_config('lonHostID');
     my $defdom = &Apache::lonnet::default_login_domain();
+    my $contacts =
+        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+                                                 $defdom,$origmail);
+    my ($contact_email) = split(/,/,$contacts);
     my $handle = &Apache::lonnet::check_for_valid_session($r);
     my $lonidsdir=$r->dir_config('lonIDsDir');
     if ($handle ne '') {
@@ -228,7 +232,7 @@ sub get_uname {
 sub send_token {
     my ($uname,$udom,$email,$server,$domdesc,$contact_name,
         $contact_email) = @_;
-    my $msg = &mt('Thank you for your request to reset the password for your LON-CAPA account.').'<br /><br />';
+    my $msg = &mt('Thank you for your request to reset the password for your Mechanics Online account.').'<br /><br />';
 
     my $now = time;
     my $temppasswd = &create_passwd();
@@ -244,13 +248,13 @@ sub send_token {
         my $esc_token = &escape($token);
         my $showtime = &Apache::lonlocal::locallocaltime(time);
         my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
-        my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime)." \n".&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',"\n\n".$reseturl);
+        my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your Mechanics Online account.',$showtime)." \n".&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',"\n\n".$reseturl);
         my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
                                 $contact_email);
         if ($result eq 'ok') {
-            $msg .= &mt('An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');
+            $msg .= &mt('An e-mail sent to the e-mail address associated with your Mechanics Online account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');
         } else {
-            $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
+            $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your Mechanics Online account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
         }
     } else {
         $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
@@ -261,7 +265,7 @@ sub send_token {
 sub send_mail {
     my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_;
     if ($subject eq '') {
-        $subject = &mt('Your LON-CAPA account');
+        $subject = &mt('Your Mechanics Online account');
     }
     my $outcome;
     my $requestmail = "To: $email\n".