IMPORTANT: Fixed spouse create/update actions to ensure only one spouse is created and updated