diff --git a/view/frontend/web/js/components/CustomerEmailField.vue b/view/frontend/web/js/components/CustomerEmailField.vue
index edfd654..cacdedd 100644
--- a/view/frontend/web/js/components/CustomerEmailField.vue
+++ b/view/frontend/web/js/components/CustomerEmailField.vue
@@ -19,7 +19,7 @@
 <script>
 import BaseInput from './BaseInput.vue'
 import axios from './../utils/checkout-axios.js'
-import { requiredIf, email } from 'vuelidate/lib/validators'
+import { required, email } from 'vuelidate/lib/validators'
 
 export default {
   components: {
@@ -36,9 +36,7 @@ export default {
   validations: {
     customer: {
       email: {
-        required: requiredIf(function () {
-          return !this.isCustomerLoggedIn
-        }),
+        required,
         email
       }
     }
diff --git a/view/frontend/web/js/components/steps/TheShippingStep.vue b/view/frontend/web/js/components/steps/TheShippingStep.vue
index 7832958..e8ae3d9 100644
--- a/view/frontend/web/js/components/steps/TheShippingStep.vue
+++ b/view/frontend/web/js/components/steps/TheShippingStep.vue
@@ -220,16 +220,13 @@ export default {
       this.$store.dispatch('updateShippingMethods', this.address.country_id.value)
     },
     goToNextStep () {
-      // show erorrs for customer email field
       if (!this.isCustomerLoggedIn) {
         this.$refs.customerEmail.touch()
       }
 
-      // show errors for shipping address form and shipping methods radio buttons
       this.$refs.shippingsMethods.touch()
       this.$v.$touch()
 
-      // check if sth from above is wrong
       if (
         this.$v.$invalid ||
         !this.shippingMethodsReadyToSubmit ||
@@ -238,21 +235,17 @@ export default {
         return
       }
 
-      // enable loader
       this.loader = true
 
-      // save shipping address
       this.$store.commit(
         'setAddress',
         { type: 'shippingAddress', address: this.address }
       )
 
-      // request for shipping informations and disable loader
       this.$store.dispatch('setShippinInformation').then(() => {
         this.loader = false
       })
 
-      // get current totals
       this.$store.dispatch('getTotals')
     }
   }