1:1 setAssociation should not clobber fields

Adds a returning option to save