Remove the ability to sign ToU while logging in via username and password
AND from OpenID sign-in