diff --git a/upgrades/5.8/scripts/AfterUpgrade.php b/upgrades/5.8/scripts/AfterUpgrade.php
index 2213bfafc4..ee18cb7499 100644
--- a/upgrades/5.8/scripts/AfterUpgrade.php
+++ b/upgrades/5.8/scripts/AfterUpgrade.php
@@ -29,6 +29,10 @@ class AfterUpgrade
         $this->populateOpportunityContactId();
 
         $this->manageIndexes();
+
+        $config = $container->get('config');
+        $config->set('personNameFormat', 'firstLast');
+        $config->save();
     }
 
     protected function populateOpportunityContactId()