#232467 by mfer, benroot, hunmonk: OpenID logins broken when 'Allow users to login using their e-mail address' setting is enabled.