URLBuilder urlBuilder = new URLBuilder(discoveryURL);
List<Pair<String, String>> queryParams = urlBuilder.getQueryParams();
queryParams.add(new Pair<String, String>(SAMLDiscovery.ENTITY_ID_PARAM, context.getLocalEntityId()));
queryParams.add(new Pair<String, String>(SAMLDiscovery.RETURN_ID_PARAM, IDP_PARAMETER));
discoveryURL = urlBuilder.buildURL();
logger.debug("Using discovery URL from extended metadata");
} else {