diff --git a/src/Form/ParticipantType.php b/src/Form/ParticipantType.php
index d81b151..f725431 100644
--- a/src/Form/ParticipantType.php
+++ b/src/Form/ParticipantType.php
@@ -281,14 +281,20 @@ class ParticipantType extends AbstractType
                         return null;
                     }
 
+                    $pickupLabel = $pickup->city;
+
+                    if (null !== $pickup->street) {
+                        $pickupLabel .= ' ('.$pickup->street.')';
+                    }
+
                     $price = $pickup->price;
 
                     if (null === $price || 0.0 === $price) {
-                        return $pickup->city;
+                        return $pickupLabel;
                     }
 
-                    return sprintf('%s (%s €)',
-                        $pickup->city,
+                    return sprintf('%s %s€',
+                        $pickupLabel,
                         number_format($price, 2, ',', '.')
                     );
                 },