some more sso fixes