diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index e7920dc15..a6aa3b331 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -219,8 +219,9 @@ return [
                 'edit' => [
                     'page-title' => 'Customer - Edit Address',
                     'title' => 'Edit Address',
+                    'street-address' => 'Street Address',
                     'submit' => 'Save Address',
-                    'success' => 'Address Updated Successfully.'
+                    'success' => 'Address Updated Successfully.',
                 ],
                 'delete' => [
                     'success' => 'Address Successfully Deleted',
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 80846d82f..a1bdf66f5 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -202,7 +202,7 @@ return [
                     'page-title' => 'Cliente - Adicionar Endereço',
                     'title' => 'Novo Endereço',
                     'address1' => 'Endereço Linha 1',
-                    'address2' => 'Endereço Linha 2',
+                    'street-address' => 'Endereço',
                     'country' => 'País',
                     'state' => 'Estado',
                     'select-state' => 'Select a region, state or province',
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 8acfe69c8..d11d32682 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
@@ -108,11 +108,11 @@
         </div>
 
         <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
-            <label for="billing[address1][]" class="required">
+            <label for="billing_address_0" class="required">
                 {{ __('shop::app.checkout.onepage.address1') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[address1][]" name="billing[address1][]" v-model="address.billing.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+            <input type="text" v-validate="'required'" class="control" id="billing_address_0" name="billing[address1][]" v-model="address.billing.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[address1][]')">
                 @{{ errors.first('address-form.billing[address1][]') }}
@@ -122,7 +122,7 @@
         @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[]" v-model="address.billing.address1[{{$i}}]">
+                    <input type="text" class="control" name="billing[address1][{{ $i }}]" id="billing_address_{{ $i }}" v-model="address.billing.address1[{{$i}}]">
                 @endfor
             </div>
         @endif
@@ -324,11 +324,11 @@
         </div>
 
         <div class="control-group" :class="[errors.has('address-form.shipping[address1][]') ? 'has-error' : '']">
-            <label for="shipping[address1][]" class="required">
+            <label for="shipping_address_0" class="required">
                 {{ __('shop::app.checkout.onepage.address1') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[address1][]" name="shipping[address1][]" v-model="address.shipping.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping_address_0" name="shipping[address1][]" v-model="address.shipping.address1[0]" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.address1') }}&quot;"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[address1][]')">
                 @{{ errors.first('address-form.shipping[address1][]') }}
@@ -338,7 +338,7 @@
         @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[]" v-model="address.shipping.address1[{{$i}}]">
+                    <input type="text" class="control" name="shipping[address1][{{ $i }}]" id="shipping_address_{{ $i }}" v-model="address.shipping.address1[{{$i}}]">
                 @endfor
             </div>
         @endif
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 fadeeae8b..99b8948ae 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
@@ -27,15 +27,15 @@
                     {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
 
                     <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="address1[]" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                        <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;">
                         <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[]">
+                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}">
                             @endfor
                         </div>
                     @endif
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 000cd6ad5..be72566f2 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
@@ -31,15 +31,15 @@
                     <?php $addresses = explode(PHP_EOL, $address->address1); ?>
 
                     <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
-                        <input type="text" class="control" name="address1[]" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
+                        <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;">
                         <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[]" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
+                                <input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
                             @endfor
                         </div>
                     @endif