Improved handling of duplicate SFDC Accounts