diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
index 9566805f3..f7770af29 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php
@@ -31,9 +31,7 @@ class RegistrationController extends Controller
     }
 
     /**
-     * Opens up the
-     * user's sign up
-     * form.
+     * Opens up the user's sign up form.
      *
      * @return view
      */
@@ -43,9 +41,7 @@ class RegistrationController extends Controller
     }
 
     /**
-     * Method to store
-     * user's sign up
-     * form data to DB
+     * Method to store user's sign up form data to DB.
      *
      * @return Mixed
      */
@@ -69,7 +65,9 @@ class RegistrationController extends Controller
 
             session()->flash('success', 'Account Created Successfully');
 
-            return redirect()->route($this->_config['redirect']);
+            return redirect()->back();
+
+            // return redirect()->route($this->_config['redirect'])->with('message', 'Account Created Successfully, Try To Log In');
 
         } else {
             session()->flash('error', 'Cannot Create Your Account');
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 291371b9b..f0e786e0e 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -25,6 +25,10 @@ body {
     font-family: "Montserrat", sans-serif;
 }
 
+input {
+    font-family: 'Montserrat', sans-serif;
+}
+
 .btn.btn-primary{
     border-radius: 0px;
 }
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
index 24dd341c3..14ef86d89 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
@@ -1,25 +1,19 @@
 @extends('shop::layouts.master')
-
 @section('page_title')
     {{ __('shop::app.customer.login-form.page-title') }}
 @endsection
-
 @section('content-wrapper')
 
     <div class="auth-content">
 
         <div class="sign-up-text">
             {{ __('shop::app.customer.login-text.no_account') }} - <a href="{{ route('customer.register.index') }}">{{ __('shop::app.customer.login-text.title') }}</a>
-
         </div>
 
-        <form method="POST" action="{{ route('customer.session.create') }}">
-
+        <form method="POST" action="{{ route('customer.session.create') }}" @submit.prevent="onSubmit">
             {{ csrf_field() }}
-
             <div class="login-form">
-
-                <div class="login-text">{{ __('shop::app.customer.login-text.title') }}</div>
+                <div class="login-text">{{ __('shop::app.customer.login-form.title') }}</div>
 
                 <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                     <label for="email">{{ __('shop::app.customer.login-form.email') }}</label>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
index 95c6f0309..e45be54c6 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
@@ -15,7 +15,6 @@
         {{ csrf_field() }}
 
         <div class="login-form">
-
             <div class="login-text">{{ __('shop::app.customer.signup-form.title') }}</div>
 
             <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
@@ -48,7 +47,7 @@
                 <span class="control-error" v-if="errors.has('password_confirmation')">@{{ errors.first('password_confirmation') }}</span>
             </div>
 
-            <div class="signup-confirm" :class="[errors.has('agreement') ? 'has-error' : '']">
+            {{-- <div class="signup-confirm" :class="[errors.has('agreement') ? 'has-error' : '']">
                 <span class="checkbox">
                     <input type="checkbox" id="checkbox2" name="agreement" v-validate="'required'">
                     <label class="checkbox-view" for="checkbox2"></label>
@@ -57,6 +56,14 @@
                     </span>
                 </span>
                 <span class="control-error" v-if="errors.has('agreement')">@{{ errors.first('agreement') }}</span>
+            </div> --}}
+            <div class="control-group" :class="[errors.has('agreement') ? 'has-error' : '']">
+
+                <input type="checkbox" id="checkbox2" name="agreement" v-validate="'required'">
+                <span>{{ __('shop::app.customer.signup-form.agree') }}
+                    <a href="">{{ __('shop::app.customer.signup-form.terms') }}</a> & <a href="">{{ __('shop::app.customer.signup-form.conditions') }}</a> {{ __('shop::app.customer.signup-form.using') }}.
+                </span>
+                <span class="control-error" v-if="errors.has('agreement')">@{{ errors.first('agreement') }}</span>
             </div>
 
             <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.signup-form.button_title') }}">