Fix do not contact list and update followup status to nil if set to admin or user
Merge branch 'MH-962' into dev