diff --git a/server.go b/server.go
index 79654c5..241a977 100644
--- a/server.go
+++ b/server.go
@@ -234,7 +234,7 @@ func handleSystemMessage(mxid string, msg string) {
 		} else {
 			ezbrSystemSendf(mxid, "No account with name or using protocol %s", cmd[1])
 		}
-	case "talk":
+	case "query", "talk":
 		account := findAccount(mxid, cmd[1])
 		if account != nil {
 			quser := connector.UserID(cmd[2])