Fix missed commit!
accept Clement's changes
fix missing class for phone/email