Add better email validation