Improve email validation and checking