1 files changed, 5 insertions, 1 deletions
diff --git a/irc_send.c b/irc_send.c
index e2ec0f59..adf1b853 100644
--- a/irc_send.c
+++ b/irc_send.c
@@ -171,7 +171,11 @@ void irc_send_join(irc_channel_t *ic, irc_user_t *iu)
 {
 	irc_t *irc = ic->irc;
 
-	irc_write(irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name);
+	if (irc->caps & CAP_EXTENDED_JOIN) {
+		irc_write(irc, ":%s!%s@%s JOIN %s * :%s", iu->nick, iu->user, iu->host, ic->name, iu->fullname);
+	} else {
+		irc_write(irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name);
+	}
 
 	if (iu == irc->user) {
 		if (ic->topic && *ic->topic) {