Email field tweaks