--- uc_store.module.orig	2009-05-20 09:43:28.000000000 -0700
+++ uc_store.module	2009-05-20 09:41:46.000000000 -0700
@@ -1359,7 +1359,12 @@ function uc_select_address($uid, $type =
 
   $options = array('0' => t('Select one...'));
   foreach ($addresses as $address) {
-    $options[drupal_to_js($address)] = check_plain($address['street1']);
+    if (!empty($address['first_name'])) {
+      $title .= $address['first_name'] . ' ' . $address['last_name'] . ' (' . $address['street1'] . ')';
+    } else {
+      $title = $address['street1'];
+    }
+    $options[drupal_to_js($address)] = check_plain($title);
   }
 
   $select = array(