diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 92a4d142..6afa57c5 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -37,8 +37,9 @@ class HomeController extends Controller
             $long = $coordinates->getLongitude();
             $lat = $coordinates->getLatitude();
 
-            // use rider id as key
-            $locations[$rider_id] = array($lat, $long);
+            // use rider map label as key
+            $rider_map_label = $rider->getMapLabel();
+            $locations[$rider_map_label] = array($lat, $long);
 
         }
 
diff --git a/src/Entity/Rider.php b/src/Entity/Rider.php
index 0f5a3116..fbe9fee5 100644
--- a/src/Entity/Rider.php
+++ b/src/Entity/Rider.php
@@ -319,4 +319,10 @@ class Rider
     {
         return $this->sessions;
     }
+
+    public function getMapLabel()
+    {
+        $map_label = $this->id . '-' . $this->first_name .' ' . $this->last_name;
+        return $map_label;
+    }
 }
diff --git a/templates/home.html.twig b/templates/home.html.twig
index 0db6800c..132789c1 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -68,9 +68,14 @@ function initMap() {
     displayMarkers();
 }
 
-function addMarker(location) {
+function addMarker(rider_id, location) {
     var marker = new google.maps.Marker({
         position: location,
+        label: { 
+            text: rider_id,
+            color: 'black',
+            fontWeight: 'bold',
+        },
         map: map
     }); 
     
@@ -107,7 +112,7 @@ function displayMarkers() {
                 lng: long
             };
 
-            addMarker(location);
+            addMarker(rider_id, location);
         });
     });
 }