--- uc_store.module.orig	2009-05-20 09:43:28.000000000 -0700
+++ uc_store.module	2009-06-08 11:46:04.000000000 -0700
@@ -1358,8 +1358,14 @@ 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']);
+  foreach ($addresses as $key => $address) {
+    $option = $address['street1'];
+    // Check if the address is a duplicate (i.e. same address, but sent to different person)
+    if ((isset($addresses[$key - 1]) && $option == $addresses[$key - 1]['street1']) ||
+        (isset($addresses[$key + 1]) && $option == $addresses[$key + 1]['street1'])) {
+      $option .= ' - ' . $address['first_name'] . ' ' . $address['last_name'];
+    }
+    $options[drupal_to_js($address)] = check_plain($option);
   }
 
   $select = array(