diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index 31ed34ba194020458aa41b6d0951550555859b5b..2cc6b84f6ec6c7210ebbab6632e75ecdce248afb 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -36,7 +36,11 @@ if(!array_key_exists('as', $_REQUEST)) {
 $as = $_REQUEST['as'];
 
 if (!$session->isValid($as)) {
-	SimpleSAML_Auth_Default::initLogin($as, SimpleSAML_Utilities::selfURL(), SimpleSAML_Utilities::selfURL());
+	$url = SimpleSAML_Utilities::selfURL();
+	$hints = array(
+		SimpleSAML_Auth_State::RESTART => $url,
+	);
+	SimpleSAML_Auth_Default::initLogin($as, $url, $url, $hints);
 }
 
 $attributes = $session->getAttributes();