Smooth out the rough edges of AWS SSO
