diff --git a/server.go b/server.go
index 84a693e..4628c13 100644
--- a/server.go
+++ b/server.go
@@ -268,7 +268,7 @@ func handleSystemMessage(mxid string, msg string) {
 			ezbrSystemSendf(mxid, "No account currently configured")
 		}
 	case "join":
-		if len(cmd) != 2 {
+		if len(cmd) != 3 {
 			ezbrSystemSendf(mxid, "Usage: %s <protocol or account> <room id>", cmd[0])
 			return
 		}
@@ -283,7 +283,7 @@ func handleSystemMessage(mxid string, msg string) {
 			ezbrSystemSendf(mxid, "No account with name or using protocol %s", cmd[1])
 		}
 	case "query", "talk":
-		if len(cmd) != 2 {
+		if len(cmd) != 3 {
 			ezbrSystemSendf(mxid, "Usage: %s <protocol or account> <user id>", cmd[0])
 			return
 		}
@@ -310,7 +310,7 @@ func handleSystemMessage(mxid string, msg string) {
 			ezbrSystemSendf(mxid, "No account with name or using protocol %s", cmd[1])
 		}
 	case "search":
-		if len(cmd) < 2 {
+		if len(cmd) < 3 {
 			ezbrSystemSendf(mxid, "Usage: %s <protocol or account> <name>", cmd[0])
 			return
 		}