Fix for missing SSO fields