Fixed email validation stuff