diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss
index ff8c76d06..12c67f89f 100644
--- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss
+++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss
@@ -89,7 +89,7 @@ body {
     }
 }
 
-.navbar-left {    
+.navbar-left {
     position: fixed;
     left: 0;
     top: 60px;
@@ -98,10 +98,10 @@ body {
     border-right: 1px solid rgba(162, 162, 162, 0.2);
     height: auto;
     bottom: 0;
-    z-index: 2;  
+    z-index: 2;
     background-color: $white;
 
-    ul.menubar {        
+    ul.menubar {
         // padding-bottom: 60px;
         li.menu-item {
             padding: 10px 5px;
@@ -309,4 +309,9 @@ body {
         margin-top: 10px;
         margin-bottom: 5px;
     }
+}
+
+.container-shadow {
+    background-color: #fff;
+    box-shadow: 0 3px 6px 0 #bbb;
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
index 12369b3b1..f87525dcb 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
@@ -31,7 +31,7 @@
                 </div>
 
                 <div class="dropdown-list bottom-right">
-                    <div class="dropdown-container">
+                    <div class="dropdown-container container-shadow">
                         <label>Account</label>
                         <ul>
                             <li>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index 920215579..ab6ac63d4 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -22,32 +22,40 @@
 
                 <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
                     <label for="company_name">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
-                    <input value="<?= old('company_name'); ?>" type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
+                    <input type="text" class="control" name="company_name" value="{{ old('company_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
                     <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;">
+                    <input type="text" class="control" name="first_name" value="{{ old('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;">
+                    <input type="text" class="control" name="last_name" value="{{ old('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" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                    <label for="vat_id" class="required">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
+                    <input type="text" class="control" name="vat_id" value="{{ old('vat_id') }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+                    <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+                </div>
+
+                <?php $addresses = explode(PHP_EOL, (old('address1') ?? '')); ?>
+
                 <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                     <label for="address_0" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
-                    <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                    <input type="text" class="control" name="address1[]" id="address_0" value="{{ $addresses[0] ?: '' }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
                     <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
                 </div>
 
                 @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
                     <div class="control-group" style="margin-top: -25px;">
                         @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
+                            <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ $addresses[$i] ?? '' }}">
                         @endfor
                     </div>
                 @endif
@@ -56,19 +64,19 @@
 
                 <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                     <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                    <input type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                    <input type="text" class="control" name="city" value="{{ old('city') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                     <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                 </div>
 
                 <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                     <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                    <input type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+                    <input type="text" class="control" name="postcode" value="{{ old('postcode') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                     <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
                 </div>
 
                 <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                     <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                    <input type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+                    <input type="text" class="control" name="phone" value="{{ old('phone') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
                     <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
                 </div>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index f58412e4e..02a5ceeb3 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -22,36 +22,42 @@
             {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
 
 
-            <?php $addresses = explode(PHP_EOL, $address->address1); ?>
+            <?php $addresses = explode(PHP_EOL, (old('address1') ?? $address->address1)); ?>
 
             <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
                 <label for="company_name">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
-                <input type="text" value="{{ $address->company_name }}"  class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
+                <input type="text"  class="control" name="company_name" value="{{ old('company_name') ?? $address->company_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
                 <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;">
+                <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $address->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 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;">
+                <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $address->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" :class="[errors.has('vat_id') ? 'has-error' : '']">
+                <label for="vat_id" class="required">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
+                <input type="text" class="control" name="vat_id" value="{{ old('vat_id') ?? $address->vat_id }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
+                <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
+            </div>
+
             <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                 <label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
-                <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                <input type="text" class="control" name="address1[]" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" id="address_0" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
                 <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
             </div>
 
             @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
                 <div class="control-group" style="margin-top: -25px;">
                     @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                        <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
+                        <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ $addresses[$i] ?? '' }}">
                     @endfor
                 </div>
             @endif
@@ -60,19 +66,19 @@
 
             <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                 <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
-                <input type="text" class="control" name="city" v-validate="'required|alpha_spaces'" value="{{ $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
+                <input type="text" class="control" name="city" value="{{ old('city') ?? $address->city }}" v-validate="'required|alpha_spaces'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                 <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
             </div>
 
             <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                 <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
-                <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
+                <input type="text" class="control" name="postcode" value="{{ old('postcode') ?? $address->postcode }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                 <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
             </div>
 
             <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                 <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
-                <input type="text" class="control" name="phone" v-validate="'required'" value="{{ $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
+                <input type="text" class="control" name="phone" value="{{ old('phone') ?? $address->phone }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
                 <span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
             </div>