diff --git a/src/view/frontend/web/js/view/email.js b/src/view/frontend/web/js/view/email.js
index 14008f0..0493175 100644
--- a/src/view/frontend/web/js/view/email.js
+++ b/src/view/frontend/web/js/view/email.js
@@ -49,11 +49,13 @@ define([
         },
 
         navigateToNextStep: function () {
-            if (this.validateEmail()) {
+            var currentStep = stepNavigator.getActiveItemIndex();
+
+            if (this.validateEmail() && stepNavigator.steps()[currentStep].code == 'email') {
                 stepNavigator.next();
             } else {
                 $(this.loginFormSelector + ' input[name=username]').focus();
             }
         }
     });
-});
\ No newline at end of file
+});