More logout work for SAML SSO