--- ircd-hybrid/modules/core/m_join.c	2006/03/01 19:32:01	499
+++ ircd-hybrid/modules/core/m_join.c	2006/03/01 19:35:59	500
@@ -237,14 +237,14 @@ m_join(struct Client *client_p, struct C
       chptr->mode.mode |= MODE_TOPICLIMIT;
       chptr->mode.mode |= MODE_NOPRIVMSGS;
 
-      sendto_server(client_p, source_p, chptr, CAP_TS6, NOCAPS, LL_ICLIENT,
+      sendto_server(client_p, source_p, chptr, CAP_TS6, NOCAPS,
                     ":%s SJOIN %lu %s +nt :@%s",
                     me.id, (unsigned long)chptr->channelts,
                     chptr->chname, source_p->id);
-      sendto_server(client_p, source_p, chptr, NOCAPS, CAP_TS6, LL_ICLIENT,
+      sendto_server(client_p, source_p, chptr, NOCAPS, CAP_TS6,
                     ":%s SJOIN %lu %s +nt :@%s",
                     me.name, (unsigned long)chptr->channelts,
-                    chptr->chname, parv[0]);
+                    chptr->chname, source_p->name);
       /*
        * notify all other users on the new channel
        */
@@ -256,11 +256,11 @@ m_join(struct Client *client_p, struct C
     }
     else
     {
-      sendto_server(client_p, source_p, chptr, CAP_TS6, NOCAPS, LL_ICLIENT,
+      sendto_server(client_p, source_p, chptr, CAP_TS6, NOCAPS,
                     ":%s JOIN %lu %s +",
                     source_p->id, (unsigned long)chptr->channelts,
                     chptr->chname);
-      sendto_server(client_p, source_p, chptr, NOCAPS, CAP_TS6, LL_ICLIENT,
+      sendto_server(client_p, source_p, chptr, NOCAPS, CAP_TS6,
                     ":%s SJOIN %lu %s + :%s",
                     me.name, (unsigned long)chptr->channelts,
                     chptr->chname, source_p->name);