diff --git a/assets/javascripts/wizard/components/wizard-group-selector.js.es6 b/assets/javascripts/wizard/components/wizard-group-selector.js.es6
index 6f487ffc..00a8f5e7 100644
--- a/assets/javascripts/wizard/components/wizard-group-selector.js.es6
+++ b/assets/javascripts/wizard/components/wizard-group-selector.js.es6
@@ -10,7 +10,7 @@ export default ComboBox.extend({
     }).map(g => {
       return {
         id: g.id,
-        name: g.full_name
+        name: g.full_name ? g.full_name : g.name
       }
     });
   })