Fixing email validation