diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index a0ffdf4215b..f63725acd9c 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -81,51 +81,45 @@
       {{/each}}
       {{#if isPaidOrder}}
         <div class="field">
-          {{ui-checkbox label=(t 'Enable Billing Information') checked=data.isBillingEnabled
-                          onChange=(action (mut data.isBillingEnabled))}}
+          <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|}}
+            <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>
-        {{#if data.isBillingEnabled}}
-          <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|}}
-              <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>
-        {{/if}}
         <h4 class="ui horizontal divider header">
           <i class="ticket icon"></i>
           {{t 'Payment Method'}}