diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 99fe83028..e8e8efa21 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -187,7 +187,7 @@ class MemberLoginForm extends LoginForm {
 			$member->sendInfo('forgotPassword', array('PasswordResetLink' =>
 				Security::getPasswordResetLink($member->AutoLoginHash)));
 
-			Director::redirect('Security/passwordsent/' . urlencode($data['Email']));
+			Director::redirect('Security/passwordsent/?email=' . urlencode($data['Email']));
 
 		} else if($data['Email']) {
 			$this->sessionMessage(
diff --git a/security/Security.php b/security/Security.php
index b5af178bc..bb59e5332 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -410,7 +410,7 @@ class Security extends Controller {
 	 *
 	 * @return string Returns the "password sent" page as HTML code.
 	 */
-	public function passwordsent() {
+	public function passwordsent($request) {
 		Requirements::javascript('jsparty/behaviour.js');
 		Requirements::javascript('jsparty/loader.js');
 		Requirements::javascript('jsparty/prototype.js');
@@ -423,7 +423,7 @@ class Security extends Controller {
 		$controller = new Page_Controller($tmpPage);
 		$controller->init();
 
-		$email = Convert::raw2xml($this->urlParams['ID']);
+		$email = Convert::raw2xml($request->getVar('email'));
 		$customisedController = $controller->customise(array(
 			'Title' => sprintf(_t('Security.PASSWORDSENTHEADER', "Password reset link sent to '%s'"), $email),
 			'Content' =>