Fix for sso