diff --git a/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6 b/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
index bca1076c..cb613107 100644
--- a/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-group-selector.js.es6
@@ -1,17 +1,19 @@
-import ComboBox from 'select-kit/components/combo-box';
+import ComboBox from "select-kit/components/combo-box";
 import { computed } from "@ember/object";
 import { makeArray } from "discourse-common/lib/helpers";
 
-export default ComboBox.extend({  
-  content: computed("groups.[]", "field.content.[]", function() {
+export default ComboBox.extend({
+  content: computed("groups.[]", "field.content.[]", function () {
     const whitelist = makeArray(this.field.content);
-    return this.groups.filter(group => {
-      return !whitelist.length || whitelist.indexOf(group.id) > -1;
-    }).map(g => {
-      return {
-        id: g.id,
-        name: g.full_name
-      }
-    });
-  })
-})
+    return this.groups
+      .filter((group) => {
+        return !whitelist.length || whitelist.indexOf(group.id) > -1;
+      })
+      .map((g) => {
+        return {
+          id: g.id,
+          name: g.full_name ? g.full_name : g.name,
+        };
+      });
+  }),
+});