diff --git a/irc/channel.go b/irc/channel.go
index 09cb373c..f0ff6cef 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -692,7 +692,7 @@ func (channel *Channel) Join(client *Client, key string, isSajoin bool, rb *Resp
 	}
 
 	if !hasPrivs && channel.flags.HasMode(modes.RegisteredOnly) && details.account == "" && !isInvited {
-		rb.Add(nil, client.server.name, ERR_BANNEDFROMCHAN, details.nick, chname, client.t("You must be registered to join that channel"))
+		rb.Add(nil, client.server.name, ERR_NEEDREGGEDNICK, details.nick, chname, client.t("You must be registered to join that channel"))
 		return
 	}
 
diff --git a/irc/numerics.go b/irc/numerics.go
index e4af7a5c..f34f0c12 100644
--- a/irc/numerics.go
+++ b/irc/numerics.go
@@ -153,7 +153,7 @@ const (
 	ERR_BANNEDFROMCHAN            = "474"
 	ERR_BADCHANNELKEY             = "475"
 	ERR_BADCHANMASK               = "476"
-	ERR_NOCHANMODES               = "477"
+	ERR_NEEDREGGEDNICK            = "477" // conflicted with ERR_NOCHANMODES; see #936
 	ERR_BANLISTFULL               = "478"
 	ERR_NOPRIVILEGES              = "481"
 	ERR_CHANOPRIVSNEEDED          = "482"