diff --git a/src/components/auth/login/the-login.vue b/src/components/auth/login/the-login.vue
index af307def..23425975 100644
--- a/src/components/auth/login/the-login.vue
+++ b/src/components/auth/login/the-login.vue
@@ -112,12 +112,16 @@ export default {
           }
         }
 
-        this.activeStep = this.activeStep + 1;
-
-        if (this.activeStep === 3) {
-          await this.get2faSessionId();
+        if (this.activeStep === 2 && this.enabledTfa) {
+          try{
+            await this.get2faSessionId();
+          } catch (err) {
+            return;
+          }
         }
 
+        this.activeStep = this.activeStep + 1;
+
       } else {
         this.$emit('submit');
       }