diff --git a/src/janus/bot.py b/src/janus/bot.py
index 1ade382..0cdc3c8 100644
--- a/src/janus/bot.py
+++ b/src/janus/bot.py
@@ -44,7 +44,10 @@ async def run(
         """
         if (client.user_name + ':') in message.body:
             return
-        message = f"{ message.sender }: { message.body }"
+        sender = from_room.user_name(message.sender) # Don't look to work
+        if sender is None:
+            sender = ':'.join(message.sender.split(':')[:-1])[1:]
+        message = f"{ sender }: { message.body }"
         for to_room in config.rooms:
             to_room = await client.resolve_room(to_room)