diff --git a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
index b3fe0a6..0ce5e10 100644
--- a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
+++ b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
@@ -1,12 +1,13 @@
 <div class="control-group pull-left">
   <label class="control-label" for="search-assigned-to">{{i18n "search.advanced.assigned.label"}}</label>
   <div class="controls">
-    {{user-selector
-      excludeCurrentUser=false
-      usernames=searchedTerms.assigned
-      single=true
-      canReceiveUpdates=true
-      class="user-selector-assigned"
+    {{user-chooser
+      value=searchedTerms.assigned
+      onChange=(action "onChangeAssigned")
+      options=(hash
+        maximum=1
+        excludeCurrentUser=false
+      )
     }}
   </div>
 </div>
diff --git a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js.es6 b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js.es6
index 3cdd800..90ec91e 100644
--- a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js.es6
+++ b/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js.es6
@@ -2,4 +2,15 @@ export default {
   shouldRender(args, component) {
     return component.currentUser && component.currentUser.can_assign;
   },
+
+  actions: {
+    onChangeAssigned(value) {
+      if (this.onChangeSearchedTermField) {
+        this.onChangeSearchedTermField("assigned", "_updateInRegex", value);
+      }
+      {
+        this.set("searchedTerms.assigned", value);
+      }
+    },
+  },
 };