diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index e0d6aedb67c83f84ea2ba77559d8733c82047529..0f056d98b7099ef35db395099070cd5aa0315eae 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -84,7 +84,17 @@ class SimpleSAML_Auth_Simple {
 			$returnTo = SimpleSAML_Utilities::createPostRedirectLink($returnTo, $_POST);
 		}
 
-		SimpleSAML_Auth_Default::initLogin($this->authSource, $returnTo);
+		/*
+		 * An URL to restart the authentication, in case the user bookmarks
+		 * something, e.g. the discovery service page.
+		 */
+		$restartURL = $this->getLoginURL($returnTo);
+
+		$hints = array(
+			SimpleSAML_Auth_State::RESTART => $restartURL,
+		);
+
+		SimpleSAML_Auth_Default::initLogin($this->authSource, $returnTo, NULL, $hints);
 	}