diff --git a/Changes b/Changes
index 438154f7e..8aa984a5a 100644
--- a/Changes
+++ b/Changes
@@ -741,3 +741,4 @@
 ** internal 3.2.3-pre1 release **
 - Fixed a bug with /invite with no parameters (accidentily broken when +I was added)
   (#0002383) reported by trystanscott.
+- Fixed a bug where /SAJOIN user 0 caused a desynch, reported by trystanscott (#0002384).
diff --git a/src/modules/m_sajoin.c b/src/modules/m_sajoin.c
index 1cdfbc237..31e47f499 100644
--- a/src/modules/m_sajoin.c
+++ b/src/modules/m_sajoin.c
@@ -172,14 +172,14 @@ DLLFUNC CMD_FUNC(m_sajoin)
 				{
 					chptr = lp->chptr;
 					sendto_channel_butserv(chptr, acptr,
-					    ":%s PART %s :%s", parv[0], chptr->chname,
+					    ":%s PART %s :%s", acptr->name, chptr->chname,
 					    "Left all channels");
 					if (MyConnect(acptr))
 						RunHook4(HOOKTYPE_LOCAL_PART, acptr, acptr, chptr,
 							 "Left all channels");
 					remove_user_from_channel(acptr, chptr);
 				}
-				sendto_serv_butone_token(acptr, parv[0],
+				sendto_serv_butone_token(acptr, acptr->name,
 				    MSG_JOIN, TOK_JOIN, "0");
 				strcpy(jbuf, "0");
 				i = 1;