diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 0293942cc..86cef38c4 100755
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -166,7 +166,7 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
         Route::get('/resend/verification/{email}', 'Webkul\Customer\Http\Controllers\RegistrationController@resendVerificationEmail')->name('customer.resend.verification-email');
 
         // for customer login checkout
-        Route::post('/custome/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
+        Route::post('/customer/exist', 'Webkul\Shop\Http\Controllers\OnepageController@checkExistCustomer')->name('customer.checkout.exist');
 
         // Auth Routes
         Route::group(['middleware' => ['customer']], function () {
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index cc7818ffd..deaf6cd83 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -495,7 +495,8 @@ return [
             'paypal-desc' => 'Paypal Standard',
             'free-desc' => 'This is a free shipping',
             'flat-desc' => 'This is a flat rate',
-            'password' => 'Password'
+            'password' => 'Password',
+            'login-exist-message' => 'You already have an account with us, Sign in or continue as guest.'
         ],
 
         'total' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
index 1bba5e59a..c3ad89f1d 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-checkout.blade.php
@@ -7,11 +7,13 @@
 
     <span class="control-error" v-if="errors.has('address-form.password')">
         @{{ errors.first('address-form.password') }}
-    </span>
+    </span> <br>
+    <span>{{ __('shop::app.checkout.onepage.login-exist-message') }}</span>
 </div>
 
-<div class="control-group" id="login-and-forgot-btn" style="display:inline-block;">
-    <div class="forgot-password-link">
+
+<div class="control-group" id="login-and-forgot-btn">
+    <div class="forgot-password-link"  style="float: right;margin-right: 503px; margin-top: 11px;">
         <a href="{{ route('customer.forgot-password.create') }}">{{ __('shop::app.customer.login-form.forgot_pass') }}</a>
         <div class="mt-10">
             @if (Cookie::has('enable-resend'))
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 47e64cd58..207531665 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
@@ -76,6 +76,23 @@
             @endauth
         </div>
 
+        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
+            <label for="billing[email]" class="required">
+                {{ __('shop::app.checkout.onepage.email') }}
+            </label>
+
+            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
+
+            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
+                @{{ errors.first('address-form.billing[email]') }}
+            </span>
+        </div>
+
+        {{--  for customer login checkout   --}}
+        @if (! auth()->guard('customer')->check())
+            @include('shop::checkout.onepage.customer-checkout')
+        @endif
+
         <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') }}
@@ -100,23 +117,6 @@
             </span>
         </div>
 
-        <div class="control-group" :class="[errors.has('address-form.billing[email]') ? 'has-error' : '']">
-            <label for="billing[email]" class="required">
-                {{ __('shop::app.checkout.onepage.email') }}
-            </label>
-
-            <input type="text" v-validate="'required|email'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"/>
-
-            <span class="control-error" v-if="errors.has('address-form.billing[email]')">
-                @{{ errors.first('address-form.billing[email]') }}
-            </span>
-        </div>
-
-        {{--  for customer login checkout   --}}
-        @if (! auth()->guard('customer')->check())
-            @include('shop::checkout.onepage.customer-checkout')
-        @endif
-
         <div class="control-group" :class="[errors.has('address-form.billing[address1][]') ? 'has-error' : '']">
             <label for="billing_address_0" class="required">
                 {{ __('shop::app.checkout.onepage.address1') }}
@@ -480,7 +480,10 @@
                         if (data == true) {
                             $("#password").show();
                             $('#login-and-forgot-btn').show();
-                        }
+                        } else {
+                            $("#password").hide();
+                            $('#login-and-forgot-btn').hide();
+                            }
                     }
                 });
             });