The design of forcing a user to set their e-mail address on login should perhaps change to have the e-mail address as an optional field and not force anybody to set it - or have it required, but that'd introduce issues with certain auth sources.

This would eliminate the inconsistency between admins and the users themselves evident in #5897.