diff --git a/AsbCloudInfrastructure/Services/MessageService.cs b/AsbCloudInfrastructure/Services/MessageService.cs
index 377c6bfb..0e5c9be2 100644
--- a/AsbCloudInfrastructure/Services/MessageService.cs
+++ b/AsbCloudInfrastructure/Services/MessageService.cs
@@ -97,9 +97,19 @@ namespace AsbCloudInfrastructure.Services
                 {
                     Date = message.Date,
                     Id = message.Id,
-                    User = users.FirstOrDefault(u => u.IdUser == message.IdTelemetryUser).MakeDisplayName(),
                 };
 
+                if (message.IdTelemetryUser is not null)
+                {
+                    if (users.Any())
+                    {
+                        var user = users.FirstOrDefault(u => u.IdUser == message.IdTelemetryUser);
+                        messageDto.User = user.MakeDisplayName();
+                    }
+                    else
+                        messageDto.User = message.IdTelemetryUser.ToString();
+                }
+
                 var e = events.FirstOrDefault(e => e.IdEvent == message.IdEvent);
                 if (e != null)
                 {
diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json
index 98b10709..cf1db760 100644
--- a/AsbCloudWebApi/appsettings.json
+++ b/AsbCloudWebApi/appsettings.json
@@ -7,7 +7,9 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
+    "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
+    "ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
+    "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
   },
   "AllowedHosts": "*",
   "Urls": "http://0.0.0.0:5000"