Tighten up the handling of $wgEmailConfirmToEdit , plus related functionality: