diff --git a/pyrevitlib/pyrevit/runtime/EventTelemetry.cs b/pyrevitlib/pyrevit/runtime/EventTelemetry.cs
index 785c941ec..7fa88263e 100644
--- a/pyrevitlib/pyrevit/runtime/EventTelemetry.cs
+++ b/pyrevitlib/pyrevit/runtime/EventTelemetry.cs
@@ -64,12 +64,14 @@ public class EventTelemetry : IEventTypeHandler {
         private static EventTelemetryExternalEventHandler extTelemetryEventHandler;
         private static ExternalEvent extTelemetryEvent;
 
-        public EventTelemetry(string handlerId) {
+        public EventTelemetry(string handlerId, string username) {
             if (handlerId == null)
                 handlerId = Guid.NewGuid().ToString();
             HandlerId = handlerId;
             extTelemetryEventHandler = new EventTelemetryExternalEventHandler();
             extTelemetryEvent = ExternalEvent.Create(extTelemetryEventHandler);
+
+            Telemetry.DefaultUser = username;
         }
 
         public static string GetParameterValue(Parameter param) {
diff --git a/pyrevitlib/pyrevit/runtime/telemetry.cs b/pyrevitlib/pyrevit/runtime/telemetry.cs
index 9f1919ef3..fdb8b16cf 100644
--- a/pyrevitlib/pyrevit/runtime/telemetry.cs
+++ b/pyrevitlib/pyrevit/runtime/telemetry.cs
@@ -34,7 +34,9 @@ public TelemetryRecord() {
 
     public static class Telemetry {
         private static string _exeBuild = null;
-        
+
+        public static string DefaultUser { get; set; } = string.Empty;
+
         public static string SerializeTelemetryRecord(object telemetryRecord) {
             return JsonConvert.SerializeObject(telemetryRecord);
         }
@@ -91,19 +93,15 @@ private static string GetISOTimeStamp(DateTime dtimeValue) {
         }
 
         public static string GetRevitUser(object source) {
-            string username = string.Empty;
-            
             switch (source) {
                 case UIApplication uiapp:
-                    username = uiapp.Application.Username;
-                    break;
+                    return uiapp.Application.Username;
 
                 case Application app:
-                    username = app.Username;
-                    break;
+                    return app.Username;
             }
 
-            return username;
+            return DefaultUser;
         }
 
         public static string GetRevitVersion(object source) {
diff --git a/pyrevitlib/pyrevit/telemetry/__init__.py b/pyrevitlib/pyrevit/telemetry/__init__.py
index 95add4743..311425b04 100644
--- a/pyrevitlib/pyrevit/telemetry/__init__.py
+++ b/pyrevitlib/pyrevit/telemetry/__init__.py
@@ -290,7 +290,7 @@ def setup_telemetry(session_id=None):
         set_apptelemetry_server_url(apptelemetry_server_url)
 
     # setup events
-    new_telemetry_handler = EventTelemetry(session_id)
+    new_telemetry_handler = EventTelemetry(session_id, HOST_APP.username)
     telemetry_handler = get_apptelemetry_handler()
     if telemetry_handler:
         # clear existing