diff --git a/app/Classes/Modules/Companies/DataTransferObjects/CompanyProfileObject.php b/app/Classes/Modules/Companies/DataTransferObjects/CompanyProfileObject.php
index 99c57f93..b82e33a0 100644
--- a/app/Classes/Modules/Companies/DataTransferObjects/CompanyProfileObject.php
+++ b/app/Classes/Modules/Companies/DataTransferObjects/CompanyProfileObject.php
@@ -7,7 +7,7 @@ use App\Classes\ValueObjects\Constants\BusinessType;
 
 class CompanyProfileObject implements DataTransferObject
 {
-    /** @var string */
+    /** @var string|null */
     private $email;
 
     /** @var string */
@@ -18,11 +18,11 @@ class CompanyProfileObject implements DataTransferObject
 
     /**
      * CompanyObject constructor.
-     * @param string $email
+     * @param string|null $email
      * @param string $phone
      * @param int|null $businessType
      */
-    public function __construct(string $email, string $phone, ?int $businessType = BusinessType::IMPORTER)
+    public function __construct(?string $email, string $phone, ?int $businessType = BusinessType::IMPORTER)
     {
         $this->email = $email;
         $this->phone = $phone;
@@ -30,9 +30,9 @@ class CompanyProfileObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return null|string
      */
-    public function getEmail(): string
+    public function getEmail(): ?string
     {
         return $this->email;
     }
diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyProfile.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyProfile.php
index 498f859d..fd5e9f5a 100644
--- a/app/Classes/Modules/Companies/Services/UpdatesCompanyProfile.php
+++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyProfile.php
@@ -19,8 +19,8 @@ class UpdatesCompanyProfile extends AbstractUpdateRecord
     {
         $model->business_type = $object->getBusinessType();
         
-        if ($model->contacts) {
-            $contact = $model->contacts()->first();
+        $contact = $model->contacts()->first();
+        if ($contact) {
             $contact->email = $object->getEmail();
             $contact->phone = $object->getPhone();
             $contact->save();
diff --git a/resources/assets/vue/components/companies/forms/EditCustomerProfileInfoFormComponent.vue b/resources/assets/vue/components/companies/forms/EditCustomerProfileInfoFormComponent.vue
index 6f5d04ff..09cdaa9a 100644
--- a/resources/assets/vue/components/companies/forms/EditCustomerProfileInfoFormComponent.vue
+++ b/resources/assets/vue/components/companies/forms/EditCustomerProfileInfoFormComponent.vue
@@ -11,7 +11,7 @@
                     <div class="row m-b-10">
                         <div class="col">
                             <validation-wrapper-component selectable :validator="$v.parameters.business_type">
-                                <label>Business Type</label>
+                                <label>Company Type</label>
                                 <selectable-component :endpoint="route('api.company.business_type.list')" section="businessTypeListSection" valueColumn="id" :labelColumn="['type']" v-model="parameters.business_type"></selectable-component>
                             </validation-wrapper-component>
                         </div>
@@ -47,7 +47,7 @@
 </template>
 <script>
     import modalFormHandler from "../../../general/mixins/modalFormHandler";
-    import { required } from "vuelidate/lib/validators";
+    import { required, email } from "vuelidate/lib/validators";
     export default {
         props: {
             data: {
@@ -77,13 +77,20 @@
                     required,
                 },
                 email: {
-                    // required,
+                    email,
                 },
                 phone: {
                     required,
                 },
             }
         },
+        watch: {
+            'data': function() {
+                this.parameters.business_type = this.data.business_type;
+                this.parameters.email = this.data.contact ? this.data.contact.email : "";
+                this.parameters.phone = this.data.contact ? this.data.contact.phone : "";
+            }
+        },
         methods: {
             submitForm(){
                 this.submit(route('api.company.profile.update', this.data.id), 'put', this.section, true, true);