diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index bb33a3c6d83c1f756417273241c9710b4927e032..22459312b45df8850a1c794a770786a49be37c83 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -189,9 +189,9 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
 
 		$idp = $this->getTargetIdp();
 		if($idp !== NULL) {
-		
-			if ($this->config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) {
-				$extDiscoveryStorage = $this->config->getBoolean('idpdisco.extDiscoveryStorage');
+
+			$extDiscoveryStorage = $this->config->getString('idpdisco.extDiscoveryStorage');
+			if ($extDiscoveryStorage !== NULL) {
 				$this->log('Choice made [' . $idp . '] (Forwarding to external discovery storage)');
 				SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
 					'entityID' => $this->spEntityId,
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 8806748377a2c1858f7f40aa8cfeb654fe680961..a9ee60fbe114ca143c4a5e4b835e92bafcd3ff7d 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -92,10 +92,8 @@ if ($idpentityid === NULL) {
 		$discourl = SimpleSAML_Utilities::getBaseURL() . 'saml2/sp/idpdisco.php';
 	}
 
-	if ($config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) {
-		
-		$extDiscoveryStorage = $config->getBoolean('idpdisco.extDiscoveryStorage');
-		
+	$extDiscoveryStorage = $config->getString('idpdisco.extDiscoveryStorage', NULL);
+	if ($extDiscoveryStorage !== NULL) {
 		SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
 			'entityID' => $spentityid,
 			'return' => SimpleSAML_Utilities::addURLparameter($discourl, array(