[#48] reordering validation checks for email