Feature/856 primary contact auto affliation

# Warning
# Info
# Issues
Fixes #856
Fixes #1009 
Also seems like a regression.