expose is_machine_adin and is_primary_email_contact flags to admin screen
Merge branch 'enhancements'