diff --git a/phpBB/login.php b/phpBB/login.php
index 77288de6f9..2176ae57d8 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -97,14 +97,12 @@ else
 	$template->set_filenames(array("body" => "login_body.tpl"));
 
 	$template->assign_vars(array(
-		"PHPEX" => $phpEx,
-		"PHP_SELF" => $PHP_SELF,
-
 		"L_USERNAME" => $l_username,
 		"L_PASSWORD" => $l_password,
 		"L_SEND_PASSWORD" => $l_resend_password,
 		"L_AUTO_LOGIN" => $l_autologin,
 		"L_LOGIN" => $l_login,
+		"U_SEND_PASSWORD" => "sendpassword.".$phpEx,
 
 		"USERNAME" => $userdata['username']
 		)
diff --git a/phpBB/templates/Default/login_body.tpl b/phpBB/templates/Default/login_body.tpl
index 4cc73503fa..c5f684c2b4 100644
--- a/phpBB/templates/Default/login_body.tpl
+++ b/phpBB/templates/Default/login_body.tpl
@@ -24,7 +24,7 @@
 								<td align="center"><input type="submit" name="submit" value="{L_LOGIN}"></td>
 							</tr>
 							<tr>
-								<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="sendpassword.{PHPEX}">{L_SEND_PASSWORD}</a></font></td>
+								<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_SEND_PASSWORD}">{L_SEND_PASSWORD}</a></font></td>
 							</tr>
 						</table></td>
 					</tr>