diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
index 98714a560..50f8695ad 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
@@ -42,6 +42,18 @@
                                 <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                             </div>
 
+                            <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                                <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                                <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                            </div>
+
+                            <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                                <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                                <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                            </div>
+
                             <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                                 <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
                                 <input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
index d13b7a10e..7f1761c00 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
@@ -41,6 +41,18 @@
                                 <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                             </div>
 
+                            <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                                <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                                <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                                <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                            </div>
+
+                            <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                                <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                                <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                                <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                            </div>
+
                             <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                                 <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
                                 <input type="text" class="control" name="vat_id" value="{{ $address->vat_id }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index 0f3124e95..bbc4f09dc 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -79,6 +79,8 @@ class AddressController extends Controller
 
         $this->validate(request(), [
             'company_name' => 'string',
+            'first_name'   => 'string|required',
+            'last_name'    => 'string|required',
             'address1'     => 'string|required',
             'country'      => 'string|required',
             'state'        => 'string|required',
@@ -142,6 +144,8 @@ class AddressController extends Controller
 
         $this->validate(request(), [
             'company_name' => 'string',
+            'first_name'   => 'string|required',
+            'last_name'    => 'string|required',
             'address1'     => 'string|required',
             'country'      => 'string|required',
             'state'        => 'string|required',
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 887c470dd..548f18b4c 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -469,6 +469,7 @@ return [
             'complete' => 'Complete',
             'billing-address' => 'Billing Address',
             'sign-in' => 'Sign In',
+            'company-name' => 'Company Name',
             'first-name' => 'First Name',
             'last-name' => 'Last Name',
             'email' => 'Email',
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index c07fb21cd..6e05979fb 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -93,6 +93,18 @@
             @include('shop::checkout.onepage.customer-checkout')
         @endif
 
+        <div class="control-group" :class="[errors.has('address-form.billing[company_name]') ? 'has-error' : '']">
+            <label for="billing[company_name]">
+                {{ __('shop::app.checkout.onepage.company-name') }}
+            </label>
+
+            <input type="text" class="control" id="billing[company_name]" name="billing[company_name]" v-model="address.billing.company_name" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.company-name') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[company_name]')">
+                @{{ errors.first('address-form.billing[company_name]') }}
+            </span>
+        </div>
+
         <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
             <label for="billing[first_name]" class="required">
                 {{ __('shop::app.checkout.onepage.first-name') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
index 3bfab1c95..95c493b9a 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
@@ -13,7 +13,7 @@
                 <div class="card-content">
                     <ul>
                         <li class="mb-10">
-                            {{ $billingAddress->name }}
+                            {{ $billingAddress->first_name }} {{ $billingAddress->last_name }}
                         </li>
                         <li class="mb-10">
                             {{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
@@ -41,7 +41,7 @@
                 <div class="card-content">
                     <ul>
                         <li class="mb-10">
-                            {{ $shippingAddress->name }}
+                            {{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}
                         </li>
                         <li class="mb-10">
                             {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
@@ -113,7 +113,7 @@
 
                     @if (isset($item->additional['attributes']))
                         <div class="item-options">
-                            
+
                             @foreach ($item->additional['attributes'] as $attribute)
                                 <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
                             @endforeach
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 980c84ae2..dcf6b5a6a 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -32,6 +32,18 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
+                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                        <input value="<?= old('first_name'); ?>" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+
+                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                        <input value="<?= old('last_name'); ?>" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                    </div>
+
                     <div class="control-group {!! $errors->has('vat_id') ? 'has-error' : '' !!}">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
                         <input type="text" class="control" name="vat_id"
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 744ecc4df..e29cf3a46 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -33,6 +33,18 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
+                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
+                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
+                        <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+
+                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
+                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
+                        <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
+                    </div>
+
                     <div class="control-group {!! $errors->has('vat_id') ? 'has-error' : '' !!}">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
                         <input type="text" class="control" name="vat_id"
diff --git a/tests/functional/Customer/CustomerCest.php b/tests/functional/Customer/CustomerCest.php
index b3c0f9256..873761be9 100644
--- a/tests/functional/Customer/CustomerCest.php
+++ b/tests/functional/Customer/CustomerCest.php
@@ -50,6 +50,8 @@ class CustomerCest
 
         $this->fields = [
             'company_name' => $faker->company,
+            'first_name'   => $faker->firstName,
+            'last_name'    => $faker->lastName,
             'vat_id'       => 'INVALIDVAT',
             'address1[]'   => $faker->streetAddress,
             'country'      => $faker->countryCode,
@@ -113,6 +115,8 @@ class CustomerCest
     {
         $I->seeRecord(CustomerAddress::class, [
             'company_name' => $this->fields['company_name'],
+            'first_name'   => $this->fields['first_name'],
+            'last_name'    => $this->fields['last_name'],
             'vat_id'       => $this->fields['vat_id'],
             'address1'     => $this->fields['address1[]'],
             'country'      => $this->fields['country'],