Added Email check