diff --git a/src/core.py b/src/core.py
index 481fb1c2..a9c97022 100644
--- a/src/core.py
+++ b/src/core.py
@@ -385,7 +385,10 @@ class Core(object):
             # No connected resource yet: the user's just connecting
             if time.time() - self.connection_time > 12:
                 # We do not display messages if we recently logged in
-                self.information("\x193}%s \x195}is \x194}online\x195} (\x190}%s\x195})" % (resource.get_jid().bare, status), "Roster")
+                if status_message:
+                    self.information("\x193}%s \x195}is \x194}online\x195} (\x19o%s\x195})" % (resource.get_jid().bare, status_message), "Roster")
+                else:
+                    self.information("\x193}%s \x195}is \x194}online\x195}" % resource.get_jid().bare, "Roster")
             self.add_information_message_to_conversation_tab(jid.bare, '\x195}%s is \x194}online' % (jid.bare))
         contact.add_resource(resource)
         if isinstance(self.current_tab(), tabs.RosterInfoTab):