diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index b1fa64ad..8cc35e93 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -383,3 +383,19 @@ span.has-danger,
 .map-info .m-badge {
 	border-radius: 0;
 }
+
+.form-group-subscription {
+	> * {
+		background-color: #f1edd5;
+		padding-top: 15px;
+		padding-bottom: 15px;
+	}
+
+	.form-control {
+		border-color: #666;
+	}
+
+	label {
+		color: #000;
+	}
+}
\ No newline at end of file
diff --git a/public/assets/images/logo-subscription.png b/public/assets/images/logo-subscription.png
new file mode 100755
index 00000000..30273c91
Binary files /dev/null and b/public/assets/images/logo-subscription.png differ
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 3b8a6a37..0a64b207 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -191,7 +191,7 @@
                                                     <div class="form-control-feedback hide" data-field="flag_research_sms"></div>
                                                 </label>
                                                 <label class="m-checkbox">
-                                                    <input type="checkbox" name="flag_research_email" id="flag-research-email" "value="1"{{ obj.getCustomer ? obj.getCustomer.isResearchEmail ? ' checked' }} >
+                                                    <input type="checkbox" name="flag_research_email" id="flag-research-email" value="1"{{ obj.getCustomer ? obj.getCustomer.isResearchEmail ? ' checked' }} >
                                                         Email
                                                     <span></span>
                                                     <div class="form-control-feedback hide" data-field="flag_research_email"></div>
@@ -233,33 +233,47 @@
 										Vehicle Details
 									</h3>
 								</div>
-								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
-										<label data-field="vmfg">Manufacturer</label>
-										<input type="text" name="vmfg" id="vmfg" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getManufacturer.getName }}" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vmfg"></div>
+								<div class="form-group m-form__group row {{ obj.getSubscription is not null ? 'form-group-subscription' }}">
+									<div class="col-lg-9">
+										<div class="row form-group">
+											<div class="col-lg-4">
+												<label data-field="vmfg">Manufacturer</label>
+												<input type="text" name="vmfg" id="vmfg" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getManufacturer.getName }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vmfg"></div>
+											</div>
+											<div class="col-lg-4">
+												<label data-field="vehicle_make">Make</label>
+												<input type="text" name="vehicle_make" id="vehicle-make" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getMake }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vehicle_make"></div>
+											</div>
+											<div class="col-lg-4">
+												<label data-field="vehicle_year">Model Year</label>
+												<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getModelYear }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vehicle_year"></div>
+											</div>
+										</div>
+										<div class="row form-group">
+											<div class="col-lg-4">
+												<label data-field="vehicle_plate">Plate #</label>
+												<input type="text" name="vehicle_plate" id="vehicle-plate" class="form-control m-input" value="{{ obj.getCustomerVehicle.getPlateNumber|default('') }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vehicle_color"></div>
+											</div>
+											<div class="col-lg-4">
+												<label data-field="vehicle_color">Color</label>
+												<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getColor }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vehicle_color"></div>
+											</div>
+											<div class="col-lg-4">
+												<label data-field="subscription">Subscription</label>
+												<input type="text" name="subscription" id="subscription" class="form-control m-input" value="{{ obj.getSubscription ? "Yes" : "No" }}" data-vehicle-field="1" disabled>
+												<div class="form-control-feedback hide" data-field="vehicle_color"></div>
+											</div>
+										</div>
 									</div>
-									<div class="col-lg-3">
-										<label data-field="vehicle_make">Make</label>
-										<input type="text" name="vehicle_make" id="vehicle-make" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getVehicle.getMake }}" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vehicle_make"></div>
-									</div>
-									<div class="col-lg-3">
-										<label data-field="vehicle_year">Model Year</label>
-										<input type="text" name="vehicle_year" id="vehicle-year" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getModelYear }}" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vehicle_year"></div>
-									</div>
-                                </div>
-								<div class="form-group m-form__group row">
-									<div class="col-lg-3">
-										<label data-field="vehicle_plate">Plate #</label>
-										<input type="text" name="vehicle_plate" id="vehicle-plate" class="form-control m-input" value="{{ obj.getCustomerVehicle.getPlateNumber|default('') }}" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vehicle_color"></div>
-									</div>
-									<div class="col-lg-3">
-										<label data-field="vehicle_color">Color</label>
-										<input type="text" name="vehicle_color" id="vehicle-color" class="form-control m-input" value="{{ obj.getCustomerVehicle ? obj.getCustomerVehicle.getColor }}" data-vehicle-field="1" disabled>
-										<div class="form-control-feedback hide" data-field="vehicle_color"></div>
+									<div class="col-lg-3 p-5 d-flex align-items-center justify-content-center">
+										{% if obj.getSubscription is not null %}
+											<img class="img-fluid" src="{{ asset('assets/images/logo-subscription.png') }}" alt="">
+										{% endif %}
 									</div>
 								</div>
 							</div>
@@ -285,15 +299,15 @@
 										<input type="text" name="warranty_expiration" id="warranty-expiration" class="form-control m-input" value="{{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.getWarrantyExpiration|date("d M Y") : '' }}" data-vehicle-field="1" disabled>
 										<div class="form-control-feedback hide" data-field="warranty_expiration"></div>
 									</div>
-                                                                        <div class="col-g-3">
-                                                                            <span class="m-switch m-switch--icon block-switch">
-                                                                                <label>
-                                                                                    <input type="checkbox" name="flag_motolite_battery" id="flag-motolite-battery" value="1" {{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.hasMotoliteBattery ? ' checked' }} disabled>
-                                                                                    <label class="switch-label">{% trans %}label.jo.vehicle_battery{% endtrans %}</label>
-                                                                                    <span></span>
-                                                                                </label>
-                                                                            </span>
-                                                                        </div>
+									<div class="col-g-3">
+										<span class="m-switch m-switch--icon block-switch">
+											<label>
+												<input type="checkbox" name="flag_motolite_battery" id="flag-motolite-battery" value="1" {{ obj.getCustomerVehicle.getCurrentBattery|default(false) ? obj.getCustomerVehicle.hasMotoliteBattery ? ' checked' }} disabled>
+												<label class="switch-label">{% trans %}label.jo.vehicle_battery{% endtrans %}</label>
+												<span></span>
+											</label>
+										</span>
+									</div>
                                     {% if obj.getCustomerVehicle %}
                                     <div class="col-lg-3">
                                         <div><label>&nbsp;</label></div>