diff --git a/src/Service/CustomerHandler/ResqCustomerHandler.php b/src/Service/CustomerHandler/ResqCustomerHandler.php
index 5f7e00e2..f0e77ebe 100644
--- a/src/Service/CustomerHandler/ResqCustomerHandler.php
+++ b/src/Service/CustomerHandler/ResqCustomerHandler.php
@@ -566,7 +566,10 @@ class ResqCustomerHandler implements CustomerHandlerInterface
             ->setCustomerNotes($req->request->get('customer_notes'))
             ->setEmail($req->request->get('email'))
             ->setIsCSAT($req->request->get('flag_csat') ? true : false)
-            ->setActive($req->request->get('flag_active') ? true : false);
+            ->setActive($req->request->get('flag_active') ? true : false)
+            ->setPromoSms($req->request->get('flag_promo_sms') ? true : false)
+            ->setPromoEmail($req->request->get('flag_promo_email') ? true : false)
+            ->setDpaConsent($req->request->get('flag_dpa_consent') ? true : false);
 
         // phone numbers
         $obj->setPhoneMobile($req->request->get('phone_mobile'))
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index f502e778..cb07b5a3 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -92,30 +92,54 @@
 	                                </div>
 	                            </div>
 	                            <div class="form-group m-form__group row">
-									<div class="col-lg-12">
-										<span class="m-switch m-switch--icon block-switch">
-											<label>
-												<input type="checkbox" name="flag_csat" id="flag_csat" value="1"{{ obj.isCSAT() ? ' checked' }}>
-												<label class="switch-label">CSAT</label>
-												<span></span>
-											</label>
-										</span>
-										<div class="form-control-feedback hide" data-field="flag_active"></div>
-									</div>
-								</div>
+                                        <div class="col-lg-4">
+                                            <span class="m-switch m-switch--icon block-switch">
+                                                <label>
+                                                    <input type="checkbox" name="flag_csat" id="flag_csat" value="1"{{ obj.isCSAT() ? ' checked' }}>
+                                                    <label class="switch-label">CSAT</label>
+                                                    <span></span>
+                                                </label>
+                                            </span>
+                                            <div class="form-control-feedback hide" data-field="flag_active"></div>
+                                        </div>
+                                        <div class="col-lg-4">
+                                            <div class="col-lg-12 form-group-inner">
+                                                <label data-field="source">Marketing Promo</label>
+                                                <div class="m-checkbox-list">
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_sms" value="1"{{ obj.isPromoSms ? ' checked' }} >
+                                                            SMS
+                                                        <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_sms"></div> 
+                                                    </label>
+                                                    <label class="m-checkbox">
+                                                        <input type="checkbox" name="flag_promo_email" value="1"{{ obj.isPromoEmail ? ' checked' }} >
+                                                            Email
+                                                        <span></span>
+                                                        <div class="form-control-feedback hide" data-field="flag_promo_email"></div>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-lg-4">
+                                            <input type="checkbox" name="flag_dpa_consent" id="flag-dpa_consent" value="1"{{ obj.isDpaConsent ? ' checked' }} >
+                                            <label class="switch-label">With DPA Consent</label>
+                                            <div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
+                                        </div>
+                                    </div>
 	                            <div class="form-group m-form__group row">
-									<div class="col-lg-12">
-										<span class="m-switch m-switch--icon block-switch">
-											<label>
-												<input type="checkbox" name="flag_active" id="flag_active" value="1"{{ obj.isActive() ? ' checked' }}>
-												<label class="switch-label">Active</label>
-												<span></span>
-											</label>
-										</span>
-										<div class="form-control-feedback hide" data-field="flag_active"></div>
-									</div>
-								</div>
-							</div>
+                                        <div class="col-lg-12">
+                                            <span class="m-switch m-switch--icon block-switch">
+                                                <label>
+                                                    <input type="checkbox" name="flag_active" id="flag_active" value="1"{{ obj.isActive() ? ' checked' }}>
+                                                    <label class="switch-label">Active</label>
+                                                    <span></span>
+                                                </label>
+                                            </span>
+                                            <div class="form-control-feedback hide" data-field="flag_active"></div>
+                                        </div>
+                                    </div>
+                                </div>
 
 							<div class="m-form__seperator m-form__seperator--dashed"></div>
 
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 8b250b52..2ad82c91 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -342,12 +342,12 @@
                                             <label data-field="source">Marketing Promo</label>
                                                 <div class="m-checkbox-list">
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" >
+                                                        <input type="checkbox" name="flag_promo_sms" value="{{ obj.getCustomer ? obj.getCustomer.isPromoSms ? ' checked': '' }}" disabled>
                                                             SMS
                                                         <span></span>
                                                     </label>
                                                     <label class="m-checkbox">
-                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" >
+                                                        <input type="checkbox" name="flag_promo_email" value="{{ obj.getCustomer ? obj.getCustomer.isPromoEmail ? ' checked': '' }}" disabled>
                                                             Email
                                                         <span></span>
                                                     </label>