Handle multiple persons / organizations for user

This refs affinitic #5926