diff --git a/irc/config.go b/irc/config.go
index 1e4ae0a1..112a5387 100644
--- a/irc/config.go
+++ b/irc/config.go
@@ -795,7 +795,7 @@ func LoadConfig(filename string) (config *Config, err error) {
 		config.Channels.MaxChannelsPerClient = 100
 	}
 	if config.Channels.Registration.MaxChannelsPerAccount == 0 {
-		config.Channels.Registration.MaxChannelsPerAccount = 10
+		config.Channels.Registration.MaxChannelsPerAccount = 15
 	}
 
 	// in the current implementation, we disable history by creating a history buffer
diff --git a/irc/handlers.go b/irc/handlers.go
index 394d2676..cceae379 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -1152,7 +1152,7 @@ func joinHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
 	oper := client.Oper()
 	for i, name := range channels {
 		if config.Channels.MaxChannelsPerClient <= client.NumChannels() && oper == nil {
-			rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), name, client.t("You have joined too many channels already"))
+			rb.Add(nil, server.name, ERR_TOOMANYCHANNELS, client.Nick(), name, client.t("You have joined too many channels"))
 			return false
 		}
 		var key string
diff --git a/oragono.yaml b/oragono.yaml
index 6f23e243..8009571b 100644
--- a/oragono.yaml
+++ b/oragono.yaml
@@ -284,7 +284,7 @@ channels:
         enabled: true
 
         # how many channels can each account register?
-        max-channels-per-account: 10
+        max-channels-per-account: 15
 
 # operator classes
 oper-classes: