allow tagging a user as primary email contact
Merge branch 'enhancements'