Index: login/forgot_password_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/login/forgot_password_form.php,v
retrieving revision 1.9
diff -u -r1.9 forgot_password_form.php
--- login/forgot_password_form.php	1 Jun 2008 17:53:26 -0000	1.9
+++ login/forgot_password_form.php	15 Aug 2009 14:22:08 -0000
@@ -8,15 +8,21 @@
         $mform    =& $this->_form;
         $renderer =& $mform->defaultRenderer();
 
-        $mform->addElement('header', '', get_string('passwordforgotten'), '');
+        $mform->addElement('header', '', get_string('searchbyusername'), '');
 
         $mform->addElement('text', 'username', get_string('username'));
         $mform->setType('username', PARAM_RAW);
 
+        $submitlabel = get_string('search');
+        $mform->addElement('submit', 'submitbutton', $submitlabel);
+        
+        $mform->addElement('header', '', get_string('searchbyemail'), '');
+        
         $mform->addElement('text', 'email', get_string('email'));
         $mform->setType('email', PARAM_RAW);
 
-        $this->add_action_buttons(true, get_string('ok'));
+        $submitlabel = get_string('search');
+        $mform->addElement('submit', 'submitbutton', $submitlabel);
     }
 
     function validation($data, $files) {
Index: lang/en_utf8/moodle.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v
retrieving revision 1.250
diff -u -r1.250 moodle.php
--- lang/en_utf8/moodle.php	3 Aug 2009 07:38:16 -0000	1.250
+++ lang/en_utf8/moodle.php	15 Aug 2009 14:22:08 -0000
@@ -632,6 +632,8 @@
 $string['entercourse'] = 'Click to enter this course';
 $string['enteremailaddress'] = 'Enter in your email address to reset your
    password and have the new password sent to you via email.';
+$string['enteremail']='Enter your email address'; 
+$string['enterusername']='Enter your username'; 
 $string['entries'] = 'Entries';
 $string['error'] = 'Error';
 $string['errortoomanylogins'] = 'Sorry, you have exceeded the allowed number of login attempts. Restart your browser.';
@@ -1217,7 +1219,7 @@
 $string['passwordconfirmchange'] = 'Confirm password change';
 $string['passwordextlink'] = 'The following link has been provided to recover your lost password. This will take you out of Moodle.';
 $string['passwordforgotten'] = 'Forgotten password';
-$string['passwordforgotteninstructions'] = 'Your details must first be found in the user database. Please enter <strong>either</strong> your username or your registered email address in the appropriate box. There is no need to enter both.';
+$string['passwordforgotteninstructions'] = 'To reset your password, submit your username or your email address below. If we can find you in the database, an email will be sent to your email address, with instructions how to get access again.';
 $string['passwordnohelp'] = 'No help is available to find your lost password. Please contact your Moodle administrator.';
 $string['passwordrecovery'] = 'Yes, help me log in';
 $string['passwordsdiffer'] = 'These passwords do not match';
@@ -1388,6 +1390,8 @@
 $string['screenshot'] = 'Screenshot';
 $string['search'] = 'Search';
 $string['searchagain'] = 'Search again';
+$string['searchbyusername'] = 'Search by username';
+$string['searchbyemail'] = 'Search by email address';
 $string['searchcourses'] = 'Search courses';
 $string['searchhelp'] = 'You can search for multiple words at once.<br /><br />word : find any match of this word within the text.<br />+word : only exact matching words will be found.<br />-word : don\'t include results containing this word.';
 $string['searchoptions'] = 'Search options';