diff --git a/.discourse-compatibility b/.discourse-compatibility
index 9f1f544..27b3b44 100644
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@@ -1,2 +1 @@
-2.7.0.beta3: 9d86b8b653a6e4715d9a1e4a39537cd114f6c799
 2.6.0.beta2: 16873e708a3c924549e77f3fea011069358d1511
diff --git a/assets/javascripts/discourse/models/query.js.es6 b/assets/javascripts/discourse/models/query.js.es6
index 781a83e..000345f 100644
--- a/assets/javascripts/discourse/models/query.js.es6
+++ b/assets/javascripts/discourse/models/query.js.es6
@@ -47,10 +47,6 @@ const Query = RestModel.extend({
         newParams[name] = pinfo["default"];
       } else if (pinfo["type"] === "boolean") {
         newParams[name] = "false";
-      } else if (pinfo["type"] === "user_id") {
-        newParams[name] = null;
-      } else if (pinfo["type"] === "user_list") {
-        newParams[name] = null;
       } else {
         newParams[name] = "";
       }
diff --git a/assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs b/assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs
index 66bf83a..d6bcde8 100644
--- a/assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs
+++ b/assets/javascripts/discourse/templates/admin/components/q-params/user_id.hbs
@@ -1,8 +1,2 @@
-{{email-group-user-chooser
-  value=value
-  options=(hash
-    maximum=1
-  )
-  onChange=(action (mut value))
-}}
+{{user-selector usernames=value single="true"}}
 <span class="param-name">{{info.identifier}}</span>
diff --git a/assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs b/assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs
index 3697b60..b12da94 100644
--- a/assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs
+++ b/assets/javascripts/discourse/templates/admin/components/q-params/user_list.hbs
@@ -1,5 +1,2 @@
-{{email-group-user-chooser
-  value=value
-  onChange=(action (mut value))
-}}
+{{user-selector usernames=value}}
 <span class="param-name">{{info.identifier}}</span>