diff --git a/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
index 98a9d958..19925c2b 100644
--- a/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
+++ b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue
@@ -101,7 +101,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="padding-15 bg-master-lightest">
+                                    <div class="padding-15 bg-master-lightest" v-if="parameters.msic_code !== 0">
                                         <p class="muted">MSIC Code</p>
                                         <p class="m-b-0">{{parameters.msic_code}}</p>
                                     </div>
@@ -232,10 +232,9 @@
                         }
                         : {})
                     },
-                    msic_code: {
-                        notZero,
-                        fiveDigits
-                    }
+                    msic_code: companyType === 1 ? {
+                        notZero, fiveDigits
+                    }: {},
                 }
             }
         },
diff --git a/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
index b537ec1c..0a168216 100644
--- a/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
@@ -12,7 +12,7 @@
               <p class="muted">TIN</p>
               <p class="m-b-0">{{ eInvoiceData.tin }}</p>
             </div>
-            <div class="padding-15 bg-master-lightest m-b-10">
+            <div class="padding-15 bg-master-lightest m-b-10" v-if="eInvoiceData.msic_code !== '0'">
               <p class="muted">MSIC Code</p>
               <p class="m-b-0">{{ eInvoiceData.msic_code }}</p>
             </div>
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 8c3a40ff..99ad6027 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -13,7 +13,7 @@
                     <div class="row" v-if="!submitted">
                         <div class="col-auto">
                             <div class="bg-danger p-l-15 p-r-15 p-t-5 p-b-5 m-b-10">
-                                <p class="m-b-0 text-white fs-12" >Any Purchase Orders that aren't submitted within 60 days will be closed for editing.</p>
+                                <p class="m-b-0 text-white fs-12" >Ensure PO details are fill in correctly — NO changes allowed after submission.</p>
                             </div>
                             <div class="bg-danger p-l-15 p-r-15 p-t-5 p-b-5" v-if="$store.getters.isAdmin && companySegmentIds.includes(24)">
                                 <p class="m-b-0 text-white fs-12" >Please note that this customer request to manual fill up the PO.</p>
diff --git a/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
index 3f432f7a..3b7a03c9 100644
--- a/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
+++ b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
@@ -166,7 +166,7 @@
                             : {})
                     }
                     : {},
-                    msic_code: isEInvoiceEnabled ? {
+                    msic_code: isEInvoiceEnabled && companyType === 1 ? {
                         notZero, fiveDigits
                     }: {},