diff --git a/modules/core/www/no_cookie.php b/modules/core/www/no_cookie.php
index 211712d6db0c149b2ca7ee994adc8f2fa8a7f1f6..a81055a8b77fc344fefbdd30ab8f98571be68afa 100644
--- a/modules/core/www/no_cookie.php
+++ b/modules/core/www/no_cookie.php
@@ -2,6 +2,7 @@
 
 if (isset($_REQUEST['retryURL'])) {
 	$retryURL = (string)$_REQUEST['retryURL'];
+	$retryURL = SimpleSAML_Utilities::normalizeURL($retryURL);
 } else {
 	$retryURL = NULL;
 }
diff --git a/www/logout.php b/www/logout.php
index 52b517dd507da65ac0825f09bafcff5b83a66cac..53942535eab8b7d1aa4ee3b941cc65ba18bdcce2 100644
--- a/www/logout.php
+++ b/www/logout.php
@@ -5,7 +5,8 @@ require_once('_include.php');
 $config = SimpleSAML_Configuration::getInstance();
 
 if(array_key_exists('link_href', $_REQUEST)) {
-	$link = $_REQUEST['link_href'];
+	$link = (string)$_REQUEST['link_href'];
+	$link = SimpleSAML_Utilities::normalizeURL($link);
 } else {
 	$link = 'index.php';
 }