Added email validity check