Fixing email validation bug