diff --git a/frontend/src/views/Login/LoginSSO.tsx b/frontend/src/views/Login/LoginSSO.tsx
index 5d81fdaec..7741602d8 100644
--- a/frontend/src/views/Login/LoginSSO.tsx
+++ b/frontend/src/views/Login/LoginSSO.tsx
@@ -30,7 +30,6 @@ export const LoginSSO = ({ providerAuthToken }: Props) => {
             email={username}
             password={password}
             setPassword={setPassword}
-            setStep={setStep}
           />
         );
       default:
diff --git a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
index e51d475aa..e2f8f99b9 100644
--- a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
+++ b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx
@@ -102,17 +102,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
 
         if (isLoginSuccessful && isLoginSuccessful.success) {
           // case: login was successful
-
-          if (isLoginSuccessful.mfaEnabled) {
-            // case: login requires MFA step
-            setStep(1);
-            setIsLoading(false);
-            return;
-          }
-
           navigateToSelectOrganization();
-
-          // case: login does not require MFA step
           createNotification({
             text: "Successfully logged in",
             type: "success"
diff --git a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
index e1dc88312..827603067 100644
--- a/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
+++ b/frontend/src/views/Login/components/PasswordStep/PasswordStep.tsx
@@ -27,16 +27,9 @@ type Props = {
   email: string;
   password: string;
   setPassword: (password: string) => void;
-  setStep: (step: number) => void;
 };
 
-export const PasswordStep = ({
-  providerAuthToken,
-  email,
-  password,
-  setPassword,
-  setStep
-}: Props) => {
+export const PasswordStep = ({ providerAuthToken, email, password, setPassword }: Props) => {
   const [isLoading, setIsLoading] = useState(false);
   const { t } = useTranslation();
   const router = useRouter();
@@ -169,12 +162,6 @@ export const PasswordStep = ({
         });
 
         if (isCliLoginSuccessful && isCliLoginSuccessful.success) {
-          if (isCliLoginSuccessful.mfaEnabled) {
-            // case: login requires MFA step
-            setStep(2);
-            setIsLoading(false);
-            return;
-          }
           const cliUrl = `http://127.0.0.1:${callbackPort}/`;
 
           // case: organization ID is present from the provider auth token -- select the org and use the new jwt token in the CLI, then navigate to the org
@@ -237,16 +224,6 @@ export const PasswordStep = ({
 
         if (loginAttempt && loginAttempt.success) {
           // case: login was successful
-
-          if (loginAttempt.mfaEnabled) {
-            // TODO: deal with MFA
-            // case: login requires MFA step
-            setIsLoading(false);
-            setStep(2);
-            return;
-          }
-
-          // case: login does not require MFA step
           setIsLoading(false);
           createNotification({
             text: "Successfully logged in",