Fix person Account Type being incorrectly set to 'Active' during Upgrade