--- modules/location/location.module	2007-08-22 18:09:16.000000000 -0600
+++ modules/location/location.module	2007-10-07 15:44:55.000000000 -0600

           
@@ -1416,7 +1416,7 @@ function location_user($op, &$edit, &$us
     return;
   }
   
-  if ($op == 'form' && $category == 'account' && $user_setting == LOCATION_USER_COLLECT) {
+  if (($op == 'form' && $category == 'account' && $user_setting == LOCATION_USER_COLLECT) || ($op == 'register' && $user_setting == LOCATION_USER_COLLECT)) {
     $form = array(1 => array());
     $form[0]['location'] = location_form(array('street', 'city', 'province', 'postal_code', 'country'), (isset($user->location) && !_location_is_empty($user->location)) ? location_api2form($user->location) : array('country' => variable_get('location_default_country', 'us')), array(), variable_get('location_suppress_country', 0) ? array('country' => variable_get('location_default_country', 'us')) : array());
     $form[0]['location']['#type'] = 'fieldset';