diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
index 979b1ba925b..4c59c3036d9 100644
--- a/app/components/forms/orders/order-form.js
+++ b/app/components/forms/orders/order-form.js
@@ -131,7 +131,7 @@ export default Component.extend(FormMixin, {
       rules: [
         {
           type   : 'empty',
-          prompt : this.l10n.t('Please enter your country')
+          prompt : this.l10n.t('Please select your country')
         }
       ]
     };
@@ -379,7 +379,7 @@ export default Component.extend(FormMixin, {
           rules      : [
             {
               type   : 'empty',
-              prompt : this.l10n.t('Please enter your country')
+              prompt : this.l10n.t('Please select your country')
             }
           ]
         },
diff --git a/app/mixins/custom-form.js b/app/mixins/custom-form.js
index f3efb745eb9..ab490ace239 100644
--- a/app/mixins/custom-form.js
+++ b/app/mixins/custom-form.js
@@ -318,7 +318,7 @@ export default Mixin.create(MutableArray, {
       this.store.createRecord('custom-form', {
         fieldIdentifier : 'country',
         form            : 'attendee',
-        type            : 'text',
+        type            : 'select',
         isRequired      : false,
         isIncluded      : false,
         event           : parent
diff --git a/app/templates/components/forms/orders/attendee-list.hbs b/app/templates/components/forms/orders/attendee-list.hbs
index fab5f33f5af..2e9cbfbff7b 100644
--- a/app/templates/components/forms/orders/attendee-list.hbs
+++ b/app/templates/components/forms/orders/attendee-list.hbs
@@ -22,6 +22,8 @@
                 </h4>
                 {{#if (is-input-field field.type) }}
                   <span>{{get holder field.fieldIdentifier}}</span>
+                {{else if (eq field.type 'select')}}
+                  <span>{{get holder field.fieldIdentifier}}</span>
                 {{/if}}
               </div>
             {{/if}}
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index d202979b48a..d8cc08c7679 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -63,9 +63,9 @@
                           name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
 
                 {{/if}}
-              {{/if}}
-              {{#if (eq field.fieldIdentifier 'gender')}}
+              {{else if (eq field.fieldIdentifier 'gender')}}
                 {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}}
+                  {{input type='hidden' name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
                   <i class="dropdown icon"></i>
                   <div class="default text">{{t 'Select your gender'}}</div>
                   <div class="menu">
@@ -76,6 +76,20 @@
                     {{/each}}
                   </div>
                 {{/ui-dropdown}}
+              {{else if (eq field.fieldIdentifier 'country')}}
+                {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.country)) as |execute mapper|}}
+                  {{input type='hidden' name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+                  <i class="dropdown icon"></i>
+                  <div class="default text">{{t 'Select your country'}}</div>
+                  <div class="menu">
+                    {{#each countries as |country|}}
+                      <div class="item" data-value="{{map-value mapper country.name}}">
+                        <i class="{{lowercase country.code}} flag"></i>
+                        {{country.name}}
+                      </div>
+                    {{/each}}
+                  </div>
+                {{/ui-dropdown}}
               {{/if}}
             </div>
           {{/if}}