--- loncom/interface/resetpw.pm	2009/10/01 21:05:12	1.17.10.2
+++ loncom/interface/resetpw.pm	2009/09/30 21:47:07	1.18
@@ -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.17.10.2 2009/10/01 21:05:12 raeburn Exp $
+# $Id: resetpw.pm,v 1.18 2009/09/30 21:47:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ sub handler {
     my $contact_name = &mt('LON-CAPA helpdesk');
     my $contact_email =  $r->dir_config('lonSupportEMail');
     my $server = $r->dir_config('lonHostID');
-    my $defdom = &Apache::lonnet::default_login_domain();
+    my $defdom = $r->dir_config('lonDefDomain');
     &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
@@ -87,7 +87,7 @@ sub handler {
                     }
                     foreach my $item (@items) {
                         if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
-                            unless(grep(/^\Q$item\E$/,@allemails)) {
+                            unless(grep(/^\Q$item\E$/,@allemails)) { 
                                 push(@allemails,$item);
                             }
                         }
@@ -126,8 +126,8 @@ sub handler {
 sub get_uname {
     my ($defdom) = @_;
     my %lt = &Apache::lonlocal::texthash(
-                                         unam => 'LON-CAPA username',
-                                         udom => 'LON-CAPA domain',
+                                         unam => 'username',
+                                         udom => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
 
@@ -141,9 +141,9 @@ sub get_uname {
 <form name="forgotpw" method="post">
 <table>
 <tr><td>
-<tr><td align="left">$lt{'unam'}:</td>
+<tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
     <td><input type="text" name="uname" size="15" /></td></tr>
-<tr><td align="left">$lt{'udom'}:</td>
+<tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
     <td>|;
     $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
     $msg .= qq|</td></tr>