Add more thorough email validation