[fix] More flexible email field