diff --git a/security/Security.php b/security/Security.php
index 71982188d..d1460a08e 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -517,8 +517,8 @@ class Security extends Controller {
 			$controller = $this;
 		}
 
-		$email = Convert::raw2xml($request->param('ID') . '.' . $request->getExtension());
-		
+		$email = Convert::raw2xml(rawurldecode($request->param('ID')) . '.' . $request->getExtension());
+
 		$customisedController = $controller->customise(array(
 			'Title' => sprintf(_t('Security.PASSWORDSENTHEADER', "Password reset link sent to '%s'"), $email),
 			'Content' =>
@@ -953,4 +953,4 @@ class Security extends Controller {
 		return self::$default_login_dest;
 	}
 
-}
\ No newline at end of file
+}