diff --git a/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue b/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue
index 7813db1d..c7cd3fec 100644
--- a/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue
+++ b/resources/assets/vue/components/companies/forms/EInvoiceInfoFormComponent.vue
@@ -207,7 +207,7 @@
                         ? {
                             required,
                             alphaNum,
-                            minLength: minLength(11),
+                            minLength: minLength(10), //was 11
                             maxLength: maxLength(13)
                         }
                         : {}),
@@ -216,7 +216,7 @@
                             required,
                             alphaNum,
                             minLength: minLength(10),
-                            maxLength: maxLength(12)
+                            maxLength: maxLength(13) ///was 12
                         }
                         : {})
                     },
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 3342adb5..3d1b988c 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -176,6 +176,14 @@
                         });
                     }
                 }
+                else{
+                    if( this.company.company_module.e_invoice && (this.company.company_module.tin === null || this.company.company_module.msic_code === null) )
+                    {
+                        this.$nextTick(() => {
+                            $('#modal-einvoice-info').modal('show');
+                        });
+                    }
+                }
             },
             errorHandler(error, statusCode, section) { //E-Invoice
                 if(section === this.section + 'CheckEInvoiceRule' && statusCode === 422){
diff --git a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
index bfa04a92..231668c1 100644
--- a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
@@ -3,6 +3,7 @@
         <small class="bold" v-for="(object, param) in validator.$params" v-if="!validator[param]">
             {{errorMessages[param]}}
             <span v-if="object && object.type === 'minLength'">{{object.min}} characters</span>
+            <span v-if="object && object.type === 'maxLength'">{{object.max}} characters</span>
             <span v-if="object && object.type === 'sameAs'">{{object.eq}} field</span>
             <span v-if="object && object.type === 'minValue'">{{object.min}}</span>
             <span v-if="object && object.type === 'maxValue'">{{errorMessages[param]}} {{object.max}}</span>
@@ -25,6 +26,7 @@
                     required: 'this field is required',
                     email: 'enter a valid email address',
                     minLength: 'this field must have at least',
+                    maxLength: 'this field must have at most',
                     minValue: 'this field must at least be',
                     sameAs: 'this field must match the',
                     numeric: 'this field can only contain numbers',
diff --git a/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue
index daafd246..90c4511e 100644
--- a/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ChangeCustomerCompanyDetailsFormComponent.vue
@@ -164,7 +164,7 @@
                             ? {
                                 required,
                                 alphaNum,
-                                minLength: minLength(11),
+                                minLength: minLength(10), //was 11
                                 maxLength: maxLength(13)
                             }
                             : {}),
@@ -173,7 +173,7 @@
                                 required,
                                 alphaNum,
                                 minLength: minLength(10),
-                                maxLength: maxLength(12)
+                                maxLength: maxLength(13) //was 12
                             }
                             : {})
                     }