diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php
index cd6ed05..2389875 100644
--- a/file/lib/page/ChatPage.class.php
+++ b/file/lib/page/ChatPage.class.php
@@ -143,7 +143,7 @@ public function readData() {
 					'username' => WCF::getUser()->username,
 					'time' => TIME_NOW,
 					'type' => chat\message\ChatMessage::TYPE_JOIN,
-					'message' => '',
+					'message' => serialize(array('ipAddress' => \wcf\util\UserUtil::convertIPv6To4(\wcf\util\UserUtil::getIpAddress()))),
 					'color1' => $this->userData['color'][1],
 					'color2' => $this->userData['color'][2]
 				)
diff --git a/language/de.xml b/language/de.xml
index dc0b96f..86083eb 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -89,7 +89,7 @@ Hinweis: Setzen Sie diese Einstellung nur, wenn Sie wissen, was sie bewirkt. Die
 	
 	<category name="wcf.chat.message">
 		<!-- 1 = TYPE_JOIN -->
-		<item name="wcf.chat.message.1"><![CDATA[hat den Chat betreten.]]></item>
+		<item name="wcf.chat.message.1"><![CDATA[hat den Chat betreten.{if true} ({$ipAddress}){/if}]]></item><!-- todo: check rights -->
 		<!-- 2 = TYPE_LEAVE -->
 		<item name="wcf.chat.message.2"><![CDATA[hat den Chat verlassen.]]></item>
 		<!-- 3 = TYPE_AWAY -->