diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
index bd3d2e7c52b..8dead19d533 100644
--- a/app/components/forms/orders/order-form.js
+++ b/app/components/forms/orders/order-form.js
@@ -38,6 +38,10 @@ export default Component.extend(FormMixin, {
   }),
   sameAsBuyer: false,
 
+  isBillingInfoNeeded: computed('event', 'data.isBillingEnabled', function() {
+    return this.event.isBillingInfoMandatory || this.data.isBillingEnabled;
+  }),
+
   getRemainingTime: computed('settings', function() {
     let orderExpiryTime = this.get('settings.orderExpiryTime');
     let willExpireAt = this.get('data.createdAt').add(orderExpiryTime, 'minutes');
@@ -380,12 +384,12 @@ export default Component.extend(FormMixin, {
             }
           ]
         },
-        company: {
-          identifier : 'company',
+        taxBusinessInfo: {
+          identifier : 'taxBusinessInfo',
           rules      : [
             {
               type   : 'empty',
-              prompt : this.l10n.t('Please enter your company')
+              prompt : this.l10n.t('Please enter your Tax ID or Business ID')
             }
           ]
         },
@@ -490,4 +494,4 @@ export default Component.extend(FormMixin, {
       }
     }
   }
-});
\ No newline at end of file
+});
diff --git a/app/models/event.js b/app/models/event.js
index d11fdb030f8..2b87426c44f 100644
--- a/app/models/event.js
+++ b/app/models/event.js
@@ -50,6 +50,7 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
   isTicketFormEnabled       : attr('boolean', { defaultValue: false }),
   isSessionsSpeakersEnabled : attr('boolean', { defaultValue: false }),
   isFeatured                : attr('boolean', { defaultValue: false }),
+  isBillingInfoMandatory    : attr('boolean', { defaultValue: false }),
 
   isTaxEnabled    : attr('boolean', { defaultValue: false }),
   canPayByPaypal  : attr('boolean', { defaultValue: false }),
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index bcabc8b30c7..d202979b48a 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -81,52 +81,23 @@
           {{/if}}
         {{/each}}
       {{/each}}
+
       {{#if isPaidOrder}}
         <h4 class="ui horizontal divider header">
           <i class="ticket icon"></i>
           {{t 'Billing Information'}}
         </h4>
-        <div class="field">
-          <label class="required" for="company">{{t 'Company'}}</label>
-          {{input type='text' id='company' value=data.company}}
-        </div>
-        <div class="field">
-          <label for="taxBusinessInfo">{{t 'Tax ID or Business ID'}}</label>
-          {{input type='text' id='taxBusinessInfo' value=data.taxBusinessInfo}}
-        </div>
-        <div class="field">
-          <label class="required" for="address">{{t 'Address'}}</label>
-          {{textarea rows='2' id='address' value=data.address}}
-        </div>
-        <div class="field">
-          <label class="required" for="city">{{t 'City'}}</label>
-          {{input type='text' id='city' value=data.city}}
-        </div>
-        <div class="field">
-          <label for="state">{{t 'State/Province'}}</label>
-          {{input type='text' id='state' value=data.state}}
-        </div>
-        <div class="field">
-          <label class="required" for="zipcode">{{t 'Zip Code'}}</label>
-          {{input type='text' id='zip_code' value=data.zipcode}}
-        </div>
-        <div class="field">
-          <label class="required">{{t 'Select country'}}</label>
-          {{#ui-dropdown class="search selection" selected=data.country
-                        onChange=(action (mut data.country)) as |execute mapper|}}
-            {{input type='hidden' id='country' value=data.country}}
-            <div class="default text">{{t 'Select country'}}</div>
-            <i class="dropdown icon"></i>
-            <div class="menu">
-              {{#each countries as |country|}}
-                <div data-value="{{map-value mapper country.name}}" class="item">
-                  <i class="{{lowercase country.code}} flag"></i>
-                  {{country.name}}
-                </div>
-              {{/each}}
-            </div>
-          {{/ui-dropdown}}
-        </div>
+        {{#unless this.event.isBillingInfoMandatory}}
+          <div class="ui center aligned field">
+            {{ui-checkbox label=(t 'Enable Billing Information') checked=data.isBillingEnabled
+                                                onChange=(action (mut data.isBillingEnabled))}}
+          </div>                                    
+        {{/unless}}
+        {{#if isBillingInfoNeeded}}   
+          {{widgets/forms/billing-info
+        	  data=data
+          	event=event}} 
+        {{/if}}
         <h4 class="ui horizontal divider header">
           <i class="ticket icon"></i>
           {{t 'Payment Method'}}
diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs
index f6fe9647005..67ea755cc11 100644
--- a/app/templates/components/forms/wizard/basic-details-step.hbs
+++ b/app/templates/components/forms/wizard/basic-details-step.hbs
@@ -492,10 +492,18 @@
             {{t 'Add Tax Information'}}
           </button>
         {{/if}}
+        <div class="ui hidden divider"></div>
+        <div class="field">
+          <div class="ui radio checkbox">
+            {{input type='checkbox' id='billing_info_mandatory' checked=data.event.isBillingInfoMandatory}}
+            <label for="billing_info">
+              <strong>{{t 'Billing Info'}}:</strong>
+              {{t 'Require Billing Information from Ticket Buyer'}}
+            </label>
+          </div>
+        </div>
       </div>
-
     </div>
-
   {{/if}}
   <div class="ui section divider"></div>
   <div class="grouped fields">
diff --git a/app/templates/components/widgets/forms/billing-info.hbs b/app/templates/components/widgets/forms/billing-info.hbs
new file mode 100644
index 00000000000..2710cb66688
--- /dev/null
+++ b/app/templates/components/widgets/forms/billing-info.hbs
@@ -0,0 +1,41 @@
+<div class="field">
+  <label class="required" for="company">{{t 'Company'}}</label>
+  {{input type='text' id='company' value=data.company}}
+</div>
+<div class="field">
+  <label for="taxBusinessInfo">{{t 'Tax ID or Business ID'}}</label>
+  {{input type='text' id='taxBusinessInfo' value=data.taxBusinessInfo}}
+</div>
+<div class="field">
+  <label class="required" for="address">{{t 'Address'}}</label>
+  {{textarea rows='2' id='address' value=data.address}}
+</div>
+<div class="field">
+  <label class="required" for="city">{{t 'City'}}</label>
+  {{input type='text' id='city' value=data.city}}
+</div>
+<div class="field">
+  <label for="state">{{t 'State/Province'}}</label>
+  {{input type='text' id='state' value=data.state}}
+</div>
+<div class="field">
+  <label class="required" for="zipcode">{{t 'Zip Code'}}</label>
+  {{input type='text' id='zip_code' value=data.zipcode}}
+</div>
+<div class="field">
+  <label class="required">{{t 'Select country'}}</label>
+  {{#ui-dropdown class="search selection" selected=data.country
+                onChange=(action (mut data.country)) as |execute mapper|}}
+    {{input type='hidden' id='country' value=data.country}}
+    <div class="default text">{{t 'Select country'}}</div>
+    <i class="dropdown icon"></i>
+    <div class="menu">
+      {{#each countries as |country|}}
+        <div data-value="{{map-value mapper country.name}}" class="item">
+          <i class="{{lowercase country.code}} flag"></i>
+          {{country.name}}
+        </div>
+      {{/each}}
+    </div>
+  {{/ui-dropdown}}
+</div>
\ No newline at end of file
diff --git a/app/templates/orders/new.hbs b/app/templates/orders/new.hbs
index 9576c2a3def..d02a58a7fa9 100644
--- a/app/templates/orders/new.hbs
+++ b/app/templates/orders/new.hbs
@@ -28,7 +28,7 @@
     </div>
     <div class="row">
       <div class="ten wide column">
-        {{forms/orders/order-form save='save' data=model.order fields=model.form settings=settings}}
+        {{forms/orders/order-form save='save' data=model.order event=model.event fields=model.form settings=settings}}
       </div>
       <div class="six wide column">
         {{#if model.order.event.ownerName}}