diff --git a/lib/kolab_chat/web/channels/room_channel.ex b/lib/kolab_chat/web/channels/room_channel.ex
index 0779f94..5204277 100644
--- a/lib/kolab_chat/web/channels/room_channel.ex
+++ b/lib/kolab_chat/web/channels/room_channel.ex
@@ -1,14 +1,14 @@
 defmodule KolabChat.Web.RoomChannel do
   use KolabChat.Web, :channel
 
   @spec join(topic :: binary(), args :: map(), socket :: pid()) :: {:ok, socket :: pid()}
   def join("room:lobby", _, socket) do
     {:ok, socket}
   end
 
   @spec handle_in(topic :: binary, args :: map(), socket :: pid()) :: {:noreply, socket :: pid()}
   def handle_in("new:message", message, socket) do
-    broadcast! socket, "new:message", %{user: message["user"], body: message["body"]}
+    broadcast! socket, "new:message", %{user: socket.assigns.user.username, body: message["body"]}
     {:noreply, socket}
   end
 end