Change strings on forgot password form when resetting password

htdocs/forgotpass.php

@@ -32,7 +32,6 @@ define('SECTION_PAGE', 'forgotpass');
 
 require('init.php');
 require_once('pieforms/pieform.php');
-define('TITLE', get_string('forgotpassword'));
 
 if (!session_id()) {
     session_start();
@@ -44,6 +43,8 @@ if (!empty($_SESSION['pwchangerequested'])) {
 }
 
 if (isset($_GET['key'])) {
+    define('TITLE', get_string('changepassword'));
+
     if (!$pwrequest = get_record('usr_password_request', 'key', $_GET['key'])) {
         die_info(get_string('nosuchpasswordrequest'));
     }
@@ -83,6 +84,8 @@ if (isset($_GET['key'])) {
     $smarty->assign('forgotpasschange_form', pieform($form));
     $smarty->display('forgotpass.tpl');
     exit;
+} else {
+    define('TITLE', get_string('forgotpassword'));
 }
 
 $form = array(

htdocs/theme/default/templates/forgotpass.tpl

@@ -2,15 +2,17 @@
 
 {include file="columnfullstart.tpl"}
 
+			{if $forgotpass_form}
 			<h2>{str tag='forgotpassword'}</h2>
 	
-			{if $forgotpass_form}
 			<p>{str tag="forgotpasswordtext"}</p>
 	
 			{$forgotpass_form}
 			{/if}
 			
 			{if $forgotpasschange_form}
+			<h2>{str tag='changepassword'}</h2>
+	
 			<p>{str tag="forgotpasswordenternew"}</p>
 			
 			{$forgotpasschange_form}