diff --git a/immich_exporter/exporter.py b/immich_exporter/exporter.py
index e7cce81..e974d90 100644
--- a/immich_exporter/exporter.py
+++ b/immich_exporter/exporter.py
@@ -135,10 +135,10 @@ class ImmichMetricsCollector:
                     "name": f"{self.config['metrics_prefix']}_server_stats_photos_by_users",
                     "value": userData[x]['photos'],
                     "labels": {
-                        "firstName": userData[x]["userName"],
+                        "firstName": userData[x]["userName"].split()[0],
 
                     },
-                    "help": f"Number of photos by user {userData[x]['userName']} "
+                    "help": f"Number of photos by user {userData[x]['userName'].split()[0]} "
 
                 }
             )
@@ -150,10 +150,10 @@ class ImmichMetricsCollector:
                     "name": f"{self.config['metrics_prefix']}_server_stats_videos_by_users",
                     "value": userData[x]['videos'],
                     "labels": {
-                        "firstName": userData[x]["userName"],
+                        "firstName": userData[x]["userName"].split()[0],
 
                     },
-                    "help": f"Number of photos by user {userData[x]['userName']} "
+                    "help": f"Number of photos by user {userData[x]['userName'].split()[0]} "
 
                 }
             )
@@ -164,10 +164,10 @@ class ImmichMetricsCollector:
                     "name": f"{self.config['metrics_prefix']}_server_stats_usage_by_users",
                     "value": (userData[x]['usage']),
                     "labels": {
-                        "firstName": userData[x]["userName"],
+                        "firstName": userData[x]["userName"].split()[0],
 
                     },
-                    "help": f"Number of photos by user {userData[x]['userName']} "
+                    "help": f"Number of photos by user {userData[x]['userName'].split()[0]} "
 
                 }
             )
diff --git a/setup.py b/setup.py
index dff7667..c4c6605 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 setup(
     name='prometheus-immich-exporter',
     packages=['immich_exporter'],
-    version='1.0.7',
+    version='1.0.8',
     long_description=long_description,
     long_description_content_type="text/markdown",
     description='Prometheus exporter for immich',