diff --git a/Changes b/Changes
index f20f36ff5..c4aad1514 100644
--- a/Changes
+++ b/Changes
@@ -531,3 +531,4 @@
 - Updated PREFIX Client Protoctl
 - Added ^MrMike^'s command list, this one will be updated
 - Removed ID_CVS, hopefully fixing some bastard stuff
+- Fixed a last minute SJOIN bug
diff --git a/src/channel.c b/src/channel.c
index 7214acbcf..51f37591c 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4453,16 +4453,16 @@ int  m_sjoin(cptr, sptr, parc, parv)
 
 	merge = nopara = nomode = removeours = removetheirs = 0;
 
-	if (SupportSJOIN(sptr) && !SupportSJ3(sptr) &&
+	if (SupportSJOIN(cptr) && !SupportSJ3(cptr) &&
 	    !strncmp(parv[4], "<none>", 6))
 		nopara = 1;
-	if (SupportSJOIN2(sptr) && !SupportSJ3(sptr) &&
+	if (SupportSJOIN2(cptr) && !SupportSJ3(cptr) &&
 	    !strncmp(parv[4], "<->", 6))
 		nopara = 1;
-	if (SupportSJ3(sptr) && (parc < 6))
+	if (SupportSJ3(cptr) && (parc < 6))
 		nopara = 1;
 
-	if (SupportSJ3(sptr))
+	if (SupportSJ3(cptr))
 	{
 		if (parc < 5)
 			nomode = 1;