--- loncom/interface/resetpw.pm	2012/02/08 15:19:46	1.23.2.2.2.1
+++ loncom/interface/resetpw.pm	2012/02/14 15:48:55	1.23.2.2.2.3
@@ -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.1 2012/02/08 15:19:46 raeburn Exp $
+# $Id: resetpw.pm,v 1.23.2.2.2.3 2012/02/14 15:48:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,12 +209,12 @@ sub get_uname {
         $value{'useremail'} = $useremail;
     }
     my $msg = '<br />'.&mt('To be able to reset a forgotten password:')
-           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your [_1] username.','Learn Physics').'</li>'
-           .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Learn Physics').'</li></ul><br />'
-           .&mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Learn Physics').'<br /><br />';
+           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your [_1] username.','Mechanics Online').'</li>'
+           .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Mechanics Online').'</li></ul><br />'
+           .&mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'<br /><br />';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box().
-            &Apache::lonhtmlcommon::row_title('Learn Physics '.$lt{'unam'}).
+            &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}).
             '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.
             '<input type="hidden" name="udom" value="'.$defdom.'" />'.
             &Apache::lonhtmlcommon::row_closure(1).
@@ -259,11 +259,14 @@ sub send_token {
 }
 
 sub send_mail {
-    my ($domdesc,$email,$mailmsg,$contact_name,$contact_email) = @_;
+    my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_;
+    if ($subject eq '') {
+        $subject = &mt('Your LON-CAPA account');
+    }
     my $outcome;
     my $requestmail = "To: $email\n".
                       "From: $contact_name <$contact_email>\n".
-                      "Subject: ".&mt('Your LON-CAPA account')."\n".
+                      "Subject: $subject\n".
                       "Content-type: text/plain\;charset=UTF-8\n".
                       "\n\n".$mailmsg."\n\n".
                       &mt('[_1] LON-CAPA support team',$domdesc)."\n".
@@ -380,7 +383,7 @@ sub reset_passwd {
             } else {
                 $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br />'.
                           '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.
-                          &mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Learn Physics').'</p>'.
+                          &mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'</p>'.
                           '<p>'.&mt('The new password must contain at least 7 characters.').' '.
                           &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);