Index: branches/5.1.x/units/addresses/addresses_event_handler.php =================================================================== diff -u -N -r13465 -r13558 --- branches/5.1.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 13465) +++ branches/5.1.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 13558) @@ -1,6 +1,6 @@ Application->recallObject('SiteHelper'); + /* @var $site_helper SiteHelper */ + + $fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); + $fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping'); + $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); + } } \ No newline at end of file