diff --git a/.discourse-compatibility b/.discourse-compatibility
index 8ebabfd..68c08e2 100644
--- a/.discourse-compatibility
+++ b/.discourse-compatibility
@@ -1,3 +1,4 @@
+2.7.0.beta3: b3367ba9d2232e00f2ae66d4c4da5787c039f953
 2.7.0.beta1: 60ef0c8f418eaf892a222ca673233fee7d08671d
 2.6.0.beta1: e78537ac4634c8a4ca085144b2af76c7e60bc066
 2.5.1: e78537ac4634c8a4ca085144b2af76c7e60bc066
diff --git a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
index a7fa229..67166c5 100644
--- a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
+++ b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
@@ -1,16 +1,15 @@
 <div class="reviewable-filter discourse-assign-assign-to-filter">
   <label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
-  {{user-selector
-    single=true
-    fullWidthWrap=true
-    allowAny=false
-    group="staff"
-    groupMembersOf=allowedGroups
-    excludeCurrentUser=false
-    includeMentionableGroups=false
-    hasGroups=false
-    usernames=additionalFilters.assigned_to
-    placeholderKey=placeholderKey
+  {{email-group-user-chooser
+    value=additionalFilters.assigned_to
+    onChange=(action "updateAssignedTo")
     autocomplete="off"
+    options=(hash
+      maximum=1
+      fullWidthWrap=true
+      filterPlaceholder=placeholderKey
+      includeGroups=false
+      groupMembersOf=allowedGroups
+    )
   }}
 </div>
diff --git a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js.es6 b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js.es6
index dd6b88b..23fd469 100644
--- a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js.es6
+++ b/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js.es6
@@ -1,4 +1,11 @@
+import { action } from "@ember/object";
+
 export default {
+  @action
+  updateAssignedTo(selected) {
+    this.set("additionalFilters.assigned_to", selected.firstObject);
+  },
+
   shouldRender(args) {
     return args.additionalFilters;
   },
diff --git a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6 b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
index d41c0ef..fb7bf22 100644
--- a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
+++ b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
@@ -72,5 +72,9 @@ export default Ember.Controller.extend({
         })
         .catch(popupAjaxError);
     },
+
+    updateUsername(selected) {
+      this.set("model.username", selected.firstObject);
+    },
   },
 });
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index c2afaa8..298f993 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -1,17 +1,17 @@
 {{#d-modal-body title="discourse_assign.assign_modal.title" class="assign"}}
   <div>
     {{i18n "discourse_assign.assign_modal.description"}}
-    {{user-selector
-      single=true
-      allowAny=false
-      groupMembersOf=allowedGroups
-      excludeCurrentUser=false
-      includeMentionableGroups=false
-      hasGroups=false
-      usernames=model.username
-      placeholderKey=placeholderKey
+    {{email-group-user-chooser
       autocomplete="off"
       autofocus="autofocus"
+      value=model.username
+      onChange=(action "updateUsername")
+      options=(hash
+        filterPlaceholder=placeholderKey
+        includeGroups=false
+        groupMembersOf=allowedGroups
+        maximum=1
+      )
     }}
     <div class="assign-suggestions">
       {{#each assignSuggestions as |user|}}
diff --git a/assets/stylesheets/assigns.scss b/assets/stylesheets/assigns.scss
index f6496a5..fda139e 100644
--- a/assets/stylesheets/assigns.scss
+++ b/assets/stylesheets/assigns.scss
@@ -63,10 +63,9 @@
   margin-left: 5px;
 }
 
-.assign.modal-body .ember-text-field {
+.assign.modal-body .email-group-user-chooser {
+  display: block;
   width: 300px;
-}
-.assign.modal-body .ac-wrap {
   margin-top: 5px;
 }