diff --git a/login/forgot_password_form.html b/login/forgot_password_form.html
index 0a745ae20d6..92e2362497d 100644
--- a/login/forgot_password_form.html
+++ b/login/forgot_password_form.html
@@ -10,7 +10,7 @@
 	<tr>
 		<td class=label><? print_string("email") ?>:</td>
 		<td><input type="text" name="email" size=25 value="<? p($frm->email) ?>"> 
-		<? formerr($err->email); ?>
+		<? if (!empty($err->email)) {formerr($err->email);} ?>
 	</tr>
 	<tr>
 		<td></td>
diff --git a/login/index_form.html b/login/index_form.html
index 429b485b07e..511e32d19ca 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -66,8 +66,8 @@
           <HR>
             <P ALIGN=CENTER><? print_string("forgotten") ?></P> 
             <CENTER>
-            <FORM NAME="form3" ACTION="<?=$changepassword ?>" METHOD=post>
-            <INPUT type="submit" NAME="Submit" VALUE="<?=$changebuttonname?>">
+            <FORM NAME="form3" ACTION="<?=$changepassword ?>" METHOD=get>
+            <INPUT type="submit" VALUE="<?=$changebuttonname?>">
             </FORM>
             </CENTER>
     <? } ?>