diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
index 8a2ae9ce..a257ed12 100644
--- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
+++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6
@@ -377,7 +377,7 @@ export default Component.extend({
       this.changeValue(event.target.value);
     },
 
-    changeUserValue(previousValue, value) {
+    changeUserValue(value) {
       this.changeValue(value);
     },
   },
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
index 60f4c0cf..cb94b7ae 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-selector.hbs
@@ -66,11 +66,13 @@
   {{/if}}
 
   {{#if showUser}}
-    {{user-selector
-      includeMessageableGroups="true"
+    {{email-group-user-chooser
       placeholderKey=placeholderKey
-      usernames=value
+      value=value
       autocomplete="discourse"
-      onChangeCallback=(action "changeUserValue")}}
+      onChange=(action "changeUserValue")
+      options=(hash
+        includeMessageableGroups="true"
+      )}}
   {{/if}}
 </div>