diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py
index e644d08e..533420dc 100644
--- a/modules/line_handler/message.py
+++ b/modules/line_handler/message.py
@@ -35,6 +35,8 @@ def message(events, event):
         user = event["server"].get_user(event["server"].nickname)
     else:
         user = event["server"].get_user(event["line"].source.nickname)
+        user.username = event["line"].source.username
+        user.hostname = event["line"].source.hostname
 
     # strip prefix_symbols from the start of target, for when people use
     # e.g. 'PRIVMSG +#channel :hi' which would send a message to only