It seems that by using SP history cookie you can avoid showing mistaken IdPs in "preferred selection" of EDS. That is, 1) Suppress storing _saml_idp cookie in EDS 2) Enable SP history cookie by putting idpHistory="true" in shibboleth2.xml Is this correct? Sincerely, Takeshi