diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index 2bc59119..92bedef8 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -2,6 +2,12 @@
 	<span class="content">
 		<Username :user="message.from" />
 		<i class="hostmask"> ({{ message.hostmask }})</i>
+		<template v-if="message.account !== false">
+			<i class="account"> [{{ message.account }}]</i>
+		</template>
+		<template v-if="message.gecos !== false">
+			<i class="realname"> {{ message.gecos }} -</i>
+		</template>
 		has joined the channel
 	</span>
 </template>
diff --git a/src/plugins/irc-events/join.js b/src/plugins/irc-events/join.js
index 79aa9cf4..741df63a 100644
--- a/src/plugins/irc-events/join.js
+++ b/src/plugins/irc-events/join.js
@@ -41,6 +41,8 @@ module.exports = function (irc, network) {
 			time: data.time,
 			from: user,
 			hostmask: data.ident + "@" + data.hostname,
+			gecos: data.gecos,
+			account: data.account,
 			type: Msg.Type.JOIN,
 			self: data.nick === irc.user.nick,
 		});