--- loncom/interface/resetpw.pm	2013/02/01 17:39:22	1.29
+++ loncom/interface/resetpw.pm	2013/03/25 16:33:08	1.32
@@ -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.29 2013/02/01 17:39:22 bisitz Exp $
+# $Id: resetpw.pm,v 1.32 2013/03/25 16:33:08 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,8 +177,8 @@ sub handler {
 sub get_uname {
     my ($defdom) = @_;
     my %lt = &Apache::lonlocal::texthash(
-                                         unam => 'username',
-                                         udom => 'domain',
+                                         unam => 'LON-CAPA username',
+                                         udom => 'LON-CAPA domain',
                                          uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
 
@@ -190,10 +190,10 @@ sub get_uname {
            .'</ul>';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box(). 
-            &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).
+            &Apache::lonhtmlcommon::row_title($lt{'unam'}).
             '<input type="text" name="uname" size="20" />'.
             &Apache::lonhtmlcommon::row_closure(1).
-            &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'udom'}).
+            &Apache::lonhtmlcommon::row_title($lt{'udom'}).
             &Apache::loncommon::select_dom_form($defdom,'udom').
             &Apache::lonhtmlcommon::row_closure(1).
             &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
@@ -429,19 +429,19 @@ sub display_actions {
                    '<a href="javascript:history.go(-1)">','</a>'));
     my $msg2 = '';
     if ($contact_email ne '') {
-            my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
-            push(@msg, &mt('Contact the [_1]LON-CAPA helpdesk[_2] for the institution: [_3]',
-                           '<a href="/adm/helpdesk?origurl='.$escuri.'">',
-                           '</a>','<i>'.$domdesc.'</i>'));
-        } else {
-            $msg2 =
-                '<p>'
-                .&mt('You may wish to send an e-mail to the'
-                    .' server administrator: [_1] for the [_2] domain.',
-                         '<i>'.$Apache::lonnet::perlvar{'AdminEmail'}.'</i>',
-                         '<i>'.$domdesc.'</i>')
-                .'</p>';
-        }
+        my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
+        push(@msg, &mt('Contact the [_1]LON-CAPA helpdesk[_2] for the institution: [_3]',
+                       '<a href="/adm/helpdesk?origurl='.$escuri.'">',
+                       '</a>','<i>'.$domdesc.'</i>'));
+    } else {
+        $msg2 =
+            '<p>'
+           .&mt('You may wish to send an e-mail to the'
+           .' server administrator: [_1] for the [_2] domain.',
+                '<i>'.$Apache::lonnet::perlvar{'AdmEMail'}.'</i>',
+                '<i>'.$domdesc.'</i>')
+           .'</p>';
+    }
 
     return &Apache::lonhtmlcommon::actionbox(\@msg).$msg2;