- if ( length($conf->config('usps_webtools-userid')) > 0 and
- !$conf->exists('address_standardize_method') ) {
- $conf->set('address_standardize_method', 'usps');
+ $conf->set('address_standardize_method', 'usps')
+ if $conf->exists('usps_webtools-userid')
+ && length($conf->config('usps_webtools-userid')) > 0
+ && ! $conf->exists('address_standardize_method');
+
+ # this option has been renamed/expanded
+ if ( $conf->exists('cust_main-enable_spouse_birthdate') ) {
+ $conf->touch('cust_main-enable_spouse');
+ $conf->delete('cust_main-enable_spouse_birthdate');