DL-71 Changing way of checking valid email