diff --git a/modules/customer/commerce_customer.module b/modules/customer/commerce_customer.module
index ac37929..d3eaae1 100644
--- a/modules/customer/commerce_customer.module
+++ b/modules/customer/commerce_customer.module
@@ -21,7 +21,6 @@ function commerce_customer_entity_info() {
         'id' => 'profile_id',
         'revision' => 'revision_id',
         'bundle' => 'type',
-        'label' => 'profile_id', // TODO: Update to use a custom callback.
       ),
       'bundle keys' => array(
         'bundle' => 'type',
@@ -42,6 +41,7 @@ function commerce_customer_entity_info() {
         ),
       ),
       'uri callback' => 'commerce_customer_profile_uri',
+      'label callback' => 'commerce_customer_profile_label',
       'token type' => 'commerce-customer-profile',
       'metadata controller class' => '',
       'access callback' => 'commerce_entity_access',
@@ -84,6 +84,15 @@ function commerce_customer_profile_uri($profile) {
 }
 
 /**
+ * Entity label callback: returns the thoroughfare (street) from the
+ * addressfield as the label representing the customer profile.
+ */
+function commerce_customer_profile_label($profile) {
+  $address = field_get_items('commerce_customer_profile', $profile, 'commerce_customer_address');
+  return $address[0]['thoroughfare'];
+}
+
+/**
  * Implements hook_hook_info().
  */
 function commerce_customer_hook_info() {