Make requiring the user to re-type email optional