Fixed issue related to email validation