Improve language in email when an IdP drops support AND improve password reset flow

I'm combining PR #2936 and PR #2961 

These address issue #1232 and issue #2937 

It sucks to conflate these two things, but because the first PR introduces a regression (makes it so that a user cannot use an email address if the provider disables), I don't think it can be merged independantly.