owner_contact also needs the same treatment that other contacts got in commit eda7bd4