diff --git a/Server/Services/BrowserHub.cs b/Server/Services/BrowserHub.cs
index 10287537..eba523e6 100644
--- a/Server/Services/BrowserHub.cs
+++ b/Server/Services/BrowserHub.cs
@@ -49,7 +49,10 @@ namespace Remotely.Server.Services
             deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
             var connections = GetActiveClientConnections(deviceIDs);
             var organizationName = DataService.GetOrganizationName(RemotelyUser.UserName);
-            return DeviceHubContext.Clients.Clients(connections.Select(x => x.Key).ToList()).SendAsync("Chat", $"{RemotelyUser.UserName}: {message}", organizationName, Context.ConnectionId);
+            return DeviceHubContext.Clients.Clients(connections.Select(x => x.Key).ToList()).SendAsync("Chat", 
+                $"{RemotelyUser.DisplayName ?? RemotelyUser.UserName}: {message}", 
+                organizationName,
+                Context.ConnectionId);
         }
 
         public Task DeployScript(string fileID, string mode, string[] deviceIDs)