diff --git a/src/ROUTES.js b/src/ROUTES.js
index d32deaa63ab0..ab7ff858e507 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -35,7 +35,6 @@ export default {
     SETTINGS_WORKSPACES: 'settings/workspaces',
     SETTINGS_SECURITY: 'settings/security',
     SETTINGS_CLOSE: 'settings/security/closeAccount',
-    SETTINGS_PASSWORD: 'settings/security/password',
     SETTINGS_ABOUT: 'settings/about',
     SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links',
     SETTINGS_PAYMENTS: 'settings/payments',
diff --git a/src/components/PasswordPopover/BasePasswordPopover.js b/src/components/PasswordPopover/BasePasswordPopover.js
deleted file mode 100644
index d3e6e26c57b0..000000000000
--- a/src/components/PasswordPopover/BasePasswordPopover.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import {View} from 'react-native';
-import React, {useState, useRef, useEffect} from 'react';
-import PropTypes from 'prop-types';
-import styles from '../../styles/styles';
-import Text from '../Text';
-import Popover from '../Popover';
-import useWindowDimensions from '../../hooks/useWindowDimensions';
-import useLocalize from '../../hooks/useLocalize';
-import TextInput from '../TextInput';
-import KeyboardSpacer from '../KeyboardSpacer';
-import {propTypes as passwordPopoverPropTypes, defaultProps as passwordPopoverDefaultProps} from './passwordPopoverPropTypes';
-import Button from '../Button';
-import withViewportOffsetTop from '../withViewportOffsetTop';
-import CONST from '../../CONST';
-
-const propTypes = {
-    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
-    shouldDelayFocus: PropTypes.bool,
-
-    ...passwordPopoverPropTypes,
-};
-
-const defaultProps = {
-    shouldDelayFocus: false,
-    ...passwordPopoverDefaultProps,
-};
-
-function BasePasswordPopover({isVisible, onClose, anchorPosition, viewportOffsetTop, shouldDelayFocus, onSubmit, submitButtonText}) {
-    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();
-    const {translate} = useLocalize();
-    const [password, setPassword] = useState('');
-    const passwordInput = useRef(null);
-
-    useEffect(() => {
-        if (isVisible) {
-            return;
-        }
-        setPassword('');
-    }, [isVisible]);
-
-    /**
-     * Focus the password input
-     */
-    const focusInput = () => {
-        if (!passwordInput.current) {
-            return;
-        }
-        passwordInput.current.focus();
-    };
-
-    return (
-        <Popover
-            isVisible={isVisible}
-            onClose={onClose}
-            anchorPosition={anchorPosition}
-            onModalShow={focusInput}
-            outerStyle={{maxHeight: windowHeight, marginTop: viewportOffsetTop}}
-        >
-            <View style={[styles.m5, !isSmallScreenWidth ? styles.sidebarPopover : '']}>
-                <Text style={[styles.mb3]}>{translate('passwordForm.pleaseFillPassword')}</Text>
-                <TextInput
-                    label={translate('common.password')}
-                    accessibilityLabel={translate('common.password')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    ref={passwordInput}
-                    secureTextEntry
-                    autoCompleteType="password"
-                    textContentType="password"
-                    value={password}
-                    onChangeText={setPassword}
-                    returnKeyType="done"
-                    onSubmitEditing={() => onSubmit(password)}
-                    style={styles.mt3}
-                    autoFocus
-                    shouldDelayFocus={shouldDelayFocus}
-                />
-                <Button
-                    onPress={() => onSubmit(password)}
-                    style={styles.mt3}
-                    text={submitButtonText}
-                />
-            </View>
-            <KeyboardSpacer />
-        </Popover>
-    );
-}
-
-BasePasswordPopover.propTypes = propTypes;
-BasePasswordPopover.defaultProps = defaultProps;
-BasePasswordPopover.displayName = 'BasePasswordPopover';
-export default withViewportOffsetTop(BasePasswordPopover);
diff --git a/src/components/PasswordPopover/index.android.js b/src/components/PasswordPopover/index.android.js
deleted file mode 100644
index 9262797bd255..000000000000
--- a/src/components/PasswordPopover/index.android.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, {forwardRef} from 'react';
-import BasePasswordPopover from './BasePasswordPopover';
-import {propTypes, defaultProps} from './passwordPopoverPropTypes';
-
-const PasswordPopover = forwardRef((props, ref) => (
-    <BasePasswordPopover
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        shouldDelayFocus
-    />
-));
-
-PasswordPopover.propTypes = propTypes;
-PasswordPopover.defaultProps = defaultProps;
-PasswordPopover.displayName = 'PasswordPopover';
-
-export default PasswordPopover;
diff --git a/src/components/PasswordPopover/index.js b/src/components/PasswordPopover/index.js
deleted file mode 100644
index 6374ffc33a9b..000000000000
--- a/src/components/PasswordPopover/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, {forwardRef} from 'react';
-import BasePasswordPopover from './BasePasswordPopover';
-import {propTypes, defaultProps} from './passwordPopoverPropTypes';
-
-const PasswordPopover = forwardRef((props, ref) => (
-    <BasePasswordPopover
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-    />
-));
-
-PasswordPopover.propTypes = propTypes;
-PasswordPopover.defaultProps = defaultProps;
-PasswordPopover.displayName = 'PasswordPopover';
-
-export default PasswordPopover;
diff --git a/src/components/PasswordPopover/passwordPopoverPropTypes.js b/src/components/PasswordPopover/passwordPopoverPropTypes.js
deleted file mode 100644
index 4b05e1822985..000000000000
--- a/src/components/PasswordPopover/passwordPopoverPropTypes.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-
-const propTypes = {
-    /** Is the popover currently showing? */
-    isVisible: PropTypes.bool.isRequired,
-
-    /** Function that gets called when the user closes the modal */
-    onClose: PropTypes.func.isRequired,
-
-    /** Where the popover should be placed */
-    anchorPosition: PropTypes.shape({
-        top: PropTypes.number,
-        left: PropTypes.number,
-    }).isRequired,
-
-    /** Function that gets called when the user clicks the delete / make default button */
-    onSubmit: PropTypes.func,
-
-    /** The text that should be displayed in the submit button */
-    submitButtonText: PropTypes.string,
-};
-
-const defaultProps = {
-    onSubmit: () => {},
-    submitButtonText: '',
-};
-
-export {propTypes, defaultProps};
diff --git a/src/libs/Authentication.js b/src/libs/Authentication.js
index 9f1967ecf0d8..4cd5e2dc3c4d 100644
--- a/src/libs/Authentication.js
+++ b/src/libs/Authentication.js
@@ -31,7 +31,7 @@ function Authenticate(parameters) {
         // and password.
         useExpensifyLogin: parameters.useExpensifyLogin,
         partnerName: parameters.partnerName,
-        partnerPassword: parameters.partnerPassword,
+        partnerPassword: parameters.partnerPassyword,
         partnerUserID: parameters.partnerUserID,
         partnerUserSecret: parameters.partnerUserSecret,
         twoFactorAuthCode: parameters.twoFactorAuthCode,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 732ec938e8ae..1c09179117b8 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -431,13 +431,6 @@ const SettingsModalStackNavigator = createModalStackNavigator([
     //     },
     //     name: 'Settings_Preferences_Theme',
     // },
-    {
-        getComponent: () => {
-            const SettingsPasswordPage = require('../../../pages/settings/PasswordPage').default;
-            return SettingsPasswordPage;
-        },
-        name: 'Settings_Password',
-    },
     {
         getComponent: () => {
             const SettingsCloseAccountPage = require('../../../pages/settings/Security/CloseAccountPage').default;
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index 2657be156a01..586be821775f 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -63,10 +63,6 @@ export default {
                                 path: ROUTES.SETTINGS_CLOSE,
                                 exact: true,
                             },
-                            Settings_Password: {
-                                path: ROUTES.SETTINGS_PASSWORD,
-                                exact: true,
-                            },
                             Settings_Security: {
                                 path: ROUTES.SETTINGS_SECURITY,
                                 exact: true,
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index f3dd7177051d..7f8dcd036365 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -78,14 +78,6 @@ function canUsePolicyExpenseChat(betas) {
     return _.contains(betas, CONST.BETAS.POLICY_EXPENSE_CHAT) || canUseAllBetas(betas);
 }
 
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUsePasswordlessLogins(betas) {
-    return _.contains(betas, CONST.BETAS.PASSWORDLESS) || canUseAllBetas(betas);
-}
-
 /**
  * @param {Array<String>} betas
  * @returns {Boolean}
@@ -111,7 +103,6 @@ export default {
     canUseCommentLinking,
     canUsePolicyRooms,
     canUsePolicyExpenseChat,
-    canUsePasswordlessLogins,
     canUseTasks,
     canUseScanReceipts,
 };
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index c120f649b401..0cf1a2f51811 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -291,14 +291,6 @@ function isValidUSPhone(phoneNumber = '', isCountryCodeOptional) {
     return parsedPhoneNumber.possible && parsedPhoneNumber.regionCode === CONST.COUNTRY.US;
 }
 
-/**
- * @param {String} password
- * @returns {Boolean}
- */
-function isValidPassword(password) {
-    return password.match(CONST.PASSWORD_COMPLEXITY_REGEX_STRING);
-}
-
 /**
  * @param {string} validateCode
  * @returns {Boolean}
@@ -461,7 +453,6 @@ export {
     isValidUSPhone,
     isValidWebsite,
     validateIdentity,
-    isValidPassword,
     isValidTwoFactorCode,
     isNumericWithSpecialChars,
     isValidPaypalUsername,
diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 34d17df99fe4..07e8a9304e24 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -120,18 +120,16 @@ function getMakeDefaultPaymentOnyxData(bankAccountID, fundID, previousPaymentMet
 /**
  * Sets the default bank account or debit card for an Expensify Wallet
  *
- * @param {String} password
  * @param {Number} bankAccountID
  * @param {Number} fundID
  * @param {Object} previousPaymentMethod
  * @param {Object} currentPaymentMethod
  *
  */
-function makeDefaultPaymentMethod(password, bankAccountID, fundID, previousPaymentMethod, currentPaymentMethod) {
+function makeDefaultPaymentMethod(bankAccountID, fundID, previousPaymentMethod, currentPaymentMethod) {
     API.write(
         'MakeDefaultPaymentMethod',
         {
-            password,
             bankAccountID,
             fundID,
         },
@@ -162,7 +160,6 @@ function addPaymentCard(params) {
             addressZip: params.addressZipCode,
             currency: CONST.CURRENCY.USD,
             isP2PDebitCard: true,
-            password: params.password,
         },
         {
             optimisticData: [
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index db7a2a66c645..7ed1883e8fae 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -324,12 +324,11 @@ function signInWithShortLivedAuthToken(email, authToken) {
  * then it will create a temporary login for them which is used when re-authenticating
  * after an authToken expires.
  *
- * @param {String} password This will be removed after passwordless beta ends
- * @param {String} [validateCode] Code for passwordless login
+ * @param {String} validateCode 6 digit code required for login
  * @param {String} [twoFactorAuthCode]
  * @param {String} [preferredLocale] Indicates which language to use when the user lands in the app
  */
-function signIn(password, validateCode, twoFactorAuthCode, preferredLocale = CONST.LOCALES.DEFAULT) {
+function signIn(validateCode, twoFactorAuthCode, preferredLocale = CONST.LOCALES.DEFAULT) {
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -380,8 +379,6 @@ function signIn(password, validateCode, twoFactorAuthCode, preferredLocale = CON
     // Conditionally pass a password or validateCode to command since we temporarily allow both flows
     if (validateCode || twoFactorAuthCode) {
         params.validateCode = validateCode || credentials.validateCode;
-    } else {
-        params.password = password;
     }
     Device.getDeviceInfoWithID().then((deviceInfo) => {
         API.write('SigninUser', {...params, deviceInfo}, {optimisticData, successData, failureData});
@@ -487,76 +484,6 @@ function initAutoAuthState(cachedAutoAuthState) {
     });
 }
 
-/**
- * User forgot the password so let's send them the link to reset their password
- */
-function resetPassword() {
-    API.write(
-        'RequestPasswordReset',
-        {
-            email: credentials.login,
-        },
-        {
-            optimisticData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {
-                        errors: null,
-                        forgotPassword: true,
-                        message: null,
-                    },
-                },
-            ],
-        },
-    );
-}
-
-function resendResetPassword() {
-    API.write(
-        'ResendRequestPasswordReset',
-        {
-            email: credentials.login,
-        },
-        {
-            optimisticData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {
-                        isLoading: true,
-                        forgotPassword: true,
-                        message: null,
-                        errors: null,
-                        loadingForm: CONST.FORMS.RESEND_VALIDATION_FORM,
-                    },
-                },
-            ],
-            successData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {
-                        isLoading: false,
-                        message: 'resendValidationForm.linkHasBeenResent',
-                        loadingForm: null,
-                    },
-                },
-            ],
-            failureData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {
-                        isLoading: false,
-                        loadingForm: null,
-                    },
-                },
-            ],
-        },
-    );
-}
-
 function invalidateCredentials() {
     Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: '', autoGeneratedPassword: ''});
 }
@@ -614,70 +541,6 @@ function clearAccountMessages() {
     });
 }
 
-/**
- * Updates a password and authenticates them
- * @param {Number} accountID
- * @param {String} validateCode
- * @param {String} password
- */
-function updatePasswordAndSignin(accountID, validateCode, password) {
-    const optimisticData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: true,
-                errors: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SESSION,
-            value: {
-                errors: null,
-            },
-        },
-    ];
-
-    const successData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: false,
-                errors: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SESSION,
-            value: {
-                errors: null,
-            },
-        },
-    ];
-
-    const failureData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: false,
-            },
-        },
-    ];
-
-    API.write(
-        'UpdatePasswordAndSignin',
-        {
-            accountID,
-            validateCode,
-            password,
-        },
-        {optimisticData, successData, failureData},
-    );
-}
-
 // It's necessary to throttle requests to reauthenticate since calling this multiple times will cause Pusher to
 // reconnect each time when we only need to reconnect once. This way, if an authToken is expired and we try to
 // subscribe to a bunch of channels at once we will only reauthenticate and force reconnect Pusher once.
@@ -906,7 +769,6 @@ export {
     beginAppleSignIn,
     setSupportAuthToken,
     checkIfActionIsAllowed,
-    updatePasswordAndSignin,
     signIn,
     signInWithValidateCode,
     signInWithValidateCodeAndNavigate,
@@ -917,8 +779,6 @@ export {
     signOutAndRedirectToSignIn,
     resendValidationLink,
     resendValidateCode,
-    resetPassword,
-    resendResetPassword,
     requestUnlinkValidationLink,
     unlinkLogin,
     clearSignInData,
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 7bc2b2b4d199..63bbc7107ae9 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -41,45 +41,6 @@ Onyx.connect({
     },
 });
 
-/**
- * Changes a password for a given account
- *
- * @param {String} oldPassword
- * @param {String} password
- */
-function updatePassword(oldPassword, password) {
-    API.write(
-        'UpdatePassword',
-        {
-            oldPassword,
-            password,
-        },
-        {
-            optimisticData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true},
-                },
-            ],
-            successData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {isLoading: false},
-                },
-            ],
-            failureData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.ACCOUNT,
-                    value: {isLoading: false},
-                },
-            ],
-        },
-    );
-}
-
 /**
  * Attempt to close the user's account
  *
@@ -301,9 +262,8 @@ function clearContactMethodErrors(contactMethod, fieldName) {
  * Adds a secondary login to a user's account
  *
  * @param {String} contactMethod
- * @param {String} password
  */
-function addNewContactMethodAndNavigate(contactMethod, password) {
+function addNewContactMethodAndNavigate(contactMethod) {
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -352,7 +312,7 @@ function addNewContactMethodAndNavigate(contactMethod, password) {
         },
     ];
 
-    API.write('AddNewContactMethod', {partnerUserID: contactMethod, password}, {optimisticData, successData, failureData});
+    API.write('AddNewContactMethod', {partnerUserID: contactMethod}, {optimisticData, successData, failureData});
     Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS);
 }
 
@@ -833,7 +793,6 @@ function updateTheme(theme) {
 }
 
 export {
-    updatePassword,
     closeAccount,
     resendValidateCode,
     requestContactMethodValidateCode,
diff --git a/src/pages/ValidateLoginPage/index.js b/src/pages/ValidateLoginPage/index.js
index 57893a03b8bc..a82279cc69e9 100644
--- a/src/pages/ValidateLoginPage/index.js
+++ b/src/pages/ValidateLoginPage/index.js
@@ -7,7 +7,6 @@ import * as User from '../../libs/actions/User';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as Session from '../../libs/actions/Session';
-import usePermissions from '../../hooks/usePermissions';
 import useLocalize from '../../hooks/useLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
 
@@ -37,7 +36,6 @@ const defaultProps = {
 };
 
 function ValidateLoginPage(props) {
-    const {canUsePasswordlessLogins} = usePermissions();
     const {preferredLocale} = useLocalize();
 
     useEffect(() => {
@@ -45,9 +43,8 @@ function ValidateLoginPage(props) {
         const accountID = lodashGet(props.route.params, 'accountID', '');
         const validateCode = lodashGet(props.route.params, 'validateCode', '');
 
-        // A fresh session will not have credentials.login and user permission betas available.
-        // In that case, we directly allow users to go through password less flow
-        if (!login || canUsePasswordlessLogins) {
+        // A fresh session will not have credentials.login available.
+        if (!login) {
             if (lodashGet(props, 'session.authToken')) {
                 // If already signed in, do not show the validate code if not on web,
                 // because we don't want to block the user with the interstitial page.
diff --git a/src/pages/ValidateLoginPage/index.website.js b/src/pages/ValidateLoginPage/index.website.js
index 9da916365a37..f0787fa163e9 100644
--- a/src/pages/ValidateLoginPage/index.website.js
+++ b/src/pages/ValidateLoginPage/index.website.js
@@ -8,7 +8,6 @@ import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndica
 import ValidateCodeModal from '../../components/ValidateCode/ValidateCodeModal';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as Session from '../../libs/actions/Session';
-import usePermissions from '../../hooks/usePermissions';
 import useLocalize from '../../hooks/useLocalize';
 import ExpiredValidateCodeModal from '../../components/ValidateCode/ExpiredValidateCodeModal';
 import Navigation from '../../libs/Navigation/Navigation';
@@ -52,7 +51,6 @@ const defaultProps = {
 };
 
 function ValidateLoginPage(props) {
-    const {canUsePasswordlessLogins} = usePermissions();
     const {preferredLocale} = useLocalize();
     const login = lodashGet(props, 'credentials.login', null);
     const autoAuthState = lodashGet(props, 'session.autoAuthState', CONST.AUTO_AUTH_STATE.NOT_STARTED);
@@ -63,9 +61,8 @@ function ValidateLoginPage(props) {
     const cachedAccountID = lodashGet(props, 'credentials.accountID', null);
 
     useEffect(() => {
-        // A fresh session will not have credentials.login and user permission betas available.
-        // In that case, we directly allow users to go through password less flow
-        if (login && !canUsePasswordlessLogins) {
+        // A fresh session will not have credentials.login
+        if (login) {
             User.validateLogin(accountID, validateCode);
             return;
         }
diff --git a/src/pages/settings/NewPasswordForm.js b/src/pages/settings/NewPasswordForm.js
deleted file mode 100644
index 71307a3eadcf..000000000000
--- a/src/pages/settings/NewPasswordForm.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, {useState, useEffect} from 'react';
-import PropTypes from 'prop-types';
-import {View} from 'react-native';
-import Text from '../../components/Text';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import CONST from '../../CONST';
-import styles from '../../styles/styles';
-import TextInput from '../../components/TextInput';
-import * as ComponentUtils from '../../libs/ComponentUtils';
-
-const propTypes = {
-    /** String to control the first password box in the form */
-    password: PropTypes.string.isRequired,
-
-    /** Function to update the first password box in the form */
-    updatePassword: PropTypes.func.isRequired,
-
-    /** Callback function called with boolean value for if the password form is valid  */
-    updateIsFormValid: PropTypes.func.isRequired,
-
-    ...withLocalizePropTypes,
-};
-
-function NewPasswordForm(props) {
-    const [passwordHintError, setPasswordHintError] = useState(false);
-
-    const isValidPassword = () => props.password.match(CONST.PASSWORD_COMPLEXITY_REGEX_STRING);
-
-    const onBlurNewPassword = () => {
-        if (passwordHintError) {
-            return;
-        }
-        if (props.password && !isValidPassword()) {
-            setPasswordHintError(true);
-        }
-    };
-
-    /**
-     * checks if the password invalid
-     * @returns {Boolean}
-     */
-    const isInvalidPassword = () => passwordHintError && props.password && !isValidPassword();
-
-    useEffect(() => {
-        props.updateIsFormValid(isValidPassword());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.password]);
-
-    return (
-        <View style={styles.mb6}>
-            <TextInput
-                autoFocus
-                label={`${props.translate('setPasswordPage.enterPassword')}`}
-                accessibilityLabel={props.translate('setPasswordPage.enterPassword')}
-                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                secureTextEntry
-                autoComplete={ComponentUtils.NEW_PASSWORD_AUTOCOMPLETE_TYPE}
-                textContentType="newPassword"
-                value={props.password}
-                onChangeText={(password) => props.updatePassword(password)}
-                onBlur={onBlurNewPassword}
-            />
-            <Text style={[styles.formHelp, styles.mt1, isInvalidPassword() && styles.formError]}>{props.translate('setPasswordPage.newPasswordPrompt')}</Text>
-        </View>
-    );
-}
-
-NewPasswordForm.propTypes = propTypes;
-NewPasswordForm.displayName = 'NewPasswordForm';
-
-export default withLocalize(NewPasswordForm);
diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
deleted file mode 100755
index 652cec65d449..000000000000
--- a/src/pages/settings/PasswordPage.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import React, {useState, useEffect, useRef} from 'react';
-import {View, ScrollView} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import PropTypes from 'prop-types';
-import _ from 'underscore';
-import HeaderWithBackButton from '../../components/HeaderWithBackButton';
-import Navigation from '../../libs/Navigation/Navigation';
-import ScreenWrapper from '../../components/ScreenWrapper';
-import Text from '../../components/Text';
-import styles from '../../styles/styles';
-import ONYXKEYS from '../../ONYXKEYS';
-import Button from '../../components/Button';
-import * as ValidationUtils from '../../libs/ValidationUtils';
-import * as User from '../../libs/actions/User';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import compose from '../../libs/compose';
-import FixedFooter from '../../components/FixedFooter';
-import TextInput from '../../components/TextInput';
-import * as Session from '../../libs/actions/Session';
-import * as ErrorUtils from '../../libs/ErrorUtils';
-import ConfirmationPage from '../../components/ConfirmationPage';
-import ROUTES from '../../ROUTES';
-import FormHelpMessage from '../../components/FormHelpMessage';
-import CONST from '../../CONST';
-
-const propTypes = {
-    /* Onyx Props */
-
-    /** Holds information about the users account that is logging in */
-    account: PropTypes.shape({
-        /** An error message to display to the user */
-        errors: PropTypes.objectOf(PropTypes.string),
-
-        /** Success message to display when necessary */
-        success: PropTypes.string,
-
-        /** Whether a sign on form is loading (being submitted) */
-        isLoading: PropTypes.bool,
-    }),
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    account: {},
-};
-
-const errorKeysMap = {
-    currentPassword: 'passwordPage.errors.currentPassword',
-    newPasswordSameAsOld: 'passwordPage.errors.newPasswordSameAsOld',
-    newPassword: 'passwordPage.errors.newPassword',
-};
-
-function PasswordPage(props) {
-    const [passwordFields, setPasswordFields] = useState({
-        currentPassword: '',
-        newPassword: '',
-    });
-    const [errors, setErrors] = useState({
-        currentPassword: false,
-        newPassword: false,
-        newPasswordSameAsOld: false,
-    });
-
-    const currentPasswordInputRef = useRef(null);
-
-    useEffect(() => () => Session.clearAccountMessages(), []);
-
-    /**
-     * @param {String} field
-     * @returns {String}
-     */
-    const getErrorText = (field) => (errors[field] ? errorKeysMap[field] : '');
-
-    /**
-     * @param {String} field
-     * @param {String} value
-     * @param {String[]} additionalErrorsToClear
-     */
-    const clearErrorAndSetValue = (field, value, additionalErrorsToClear) => {
-        const errorsToReset = {
-            [field]: false,
-        };
-        if (additionalErrorsToClear) {
-            _.each(additionalErrorsToClear, (errorFlag) => {
-                errorsToReset[errorFlag] = false;
-            });
-        }
-        setPasswordFields((prev) => ({...prev, [field]: value}));
-        setErrors((prev) => ({...prev, ...errorsToReset}));
-    };
-
-    /**
-     * @returns {Boolean}
-     */
-    const validate = () => {
-        const error = {};
-
-        if (!passwordFields.currentPassword) {
-            error.currentPassword = true;
-        }
-
-        if (!passwordFields.newPassword || !ValidationUtils.isValidPassword(passwordFields.newPassword)) {
-            error.newPassword = true;
-        }
-
-        if (passwordFields.currentPassword && passwordFields.newPassword && _.isEqual(passwordFields.currentPassword, passwordFields.newPassword)) {
-            error.newPasswordSameAsOld = true;
-        }
-
-        setErrors(error);
-        return _.size(error) === 0;
-    };
-
-    /**
-     * Submit the form
-     */
-    const submit = () => {
-        if (!validate()) {
-            return;
-        }
-        User.updatePassword(passwordFields.currentPassword, passwordFields.newPassword);
-    };
-
-    const shouldShowNewPasswordPrompt = !errors.newPassword && !errors.newPasswordSameAsOld;
-    return (
-        <ScreenWrapper
-            onEntryTransitionEnd={() => {
-                if (!currentPasswordInputRef.current) {
-                    return;
-                }
-
-                currentPasswordInputRef.current.focus();
-            }}
-        >
-            <HeaderWithBackButton
-                title={props.translate('passwordPage.changePassword')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_SECURITY)}
-            />
-            {!_.isEmpty(props.account.success) ? (
-                <ConfirmationPage
-                    heading={props.translate('passwordConfirmationScreen.passwordUpdated')}
-                    shouldShowButton
-                    onButtonPress={Navigation.goBack}
-                    buttonText={props.translate('common.buttonConfirm')}
-                    description={props.translate('passwordConfirmationScreen.allSet')}
-                />
-            ) : (
-                <>
-                    <ScrollView
-                        style={styles.flex1}
-                        contentContainerStyle={styles.p5}
-                        // Allow the user to click show password while password input is focused.
-                        // eslint-disable-next-line react/jsx-props-no-multi-spaces
-                        keyboardShouldPersistTaps="always"
-                    >
-                        <Text style={[styles.mb6]}>{props.translate('passwordPage.changingYourPasswordPrompt')}</Text>
-                        <View style={styles.mb6}>
-                            <TextInput
-                                label={`${props.translate('passwordPage.currentPassword')}*`}
-                                accessibilityLabel={`${props.translate('passwordPage.currentPassword')}*`}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                ref={currentPasswordInputRef}
-                                secureTextEntry
-                                autoCompleteType="password"
-                                textContentType="password"
-                                value={passwordFields.currentPassword}
-                                onChangeText={(text) => clearErrorAndSetValue('currentPassword', text)}
-                                returnKeyType="done"
-                                hasError={errors.currentPassword}
-                                errorText={getErrorText('currentPassword')}
-                                onSubmitEditing={submit}
-                            />
-                        </View>
-                        <View style={styles.mb6}>
-                            <TextInput
-                                label={`${props.translate('passwordPage.newPassword')}*`}
-                                accessibilityLabel={`${props.translate('passwordPage.newPassword')}*`}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                secureTextEntry
-                                autoCompleteType="password"
-                                textContentType="password"
-                                value={passwordFields.newPassword}
-                                hasError={errors.newPassword || errors.newPasswordSameAsOld}
-                                errorText={errors.newPasswordSameAsOld ? getErrorText('newPasswordSameAsOld') : getErrorText('newPassword')}
-                                onChangeText={(text) => clearErrorAndSetValue('newPassword', text, ['newPasswordSameAsOld'])}
-                                onSubmitEditing={submit}
-                            />
-                            {shouldShowNewPasswordPrompt && <Text style={[styles.textLabelSupporting, styles.mt1]}>{props.translate('passwordPage.newPasswordPrompt')}</Text>}
-                        </View>
-                        {_.every(errors, (error) => !error) && !_.isEmpty(props.account.errors) && (
-                            <FormHelpMessage
-                                isError
-                                message={ErrorUtils.getLatestErrorMessage(props.account)}
-                            />
-                        )}
-                    </ScrollView>
-                    <FixedFooter style={[styles.flexGrow0]}>
-                        <Button
-                            success
-                            isLoading={props.account.isLoading}
-                            text={props.translate('common.save')}
-                            onPress={submit}
-                        />
-                    </FixedFooter>
-                </>
-            )}
-        </ScreenWrapper>
-    );
-}
-
-PasswordPage.propTypes = propTypes;
-PasswordPage.defaultProps = defaultProps;
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        account: {
-            key: ONYXKEYS.ACCOUNT,
-        },
-    }),
-)(PasswordPage);
diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Payments/AddDebitCardPage.js
index 28eef903d590..13da43710428 100644
--- a/src/pages/settings/Payments/AddDebitCardPage.js
+++ b/src/pages/settings/Payments/AddDebitCardPage.js
@@ -1,6 +1,5 @@
 import React, {useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
@@ -17,9 +16,7 @@ import TextInput from '../../../components/TextInput';
 import CONST from '../../../CONST';
 import ONYXKEYS from '../../../ONYXKEYS';
 import AddressSearch from '../../../components/AddressSearch';
-import * as ComponentUtils from '../../../libs/ComponentUtils';
 import Form from '../../../components/Form';
-import Permissions from '../../../libs/Permissions';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import usePrevious from '../../../hooks/usePrevious';
@@ -29,16 +26,12 @@ const propTypes = {
     formData: PropTypes.shape({
         setupComplete: PropTypes.bool,
     }),
-
-    /** List of betas available to current user */
-    betas: PropTypes.arrayOf(PropTypes.string),
 };
 
 const defaultProps = {
     formData: {
         setupComplete: false,
     },
-    betas: [],
 };
 
 function DebitCardPage(props) {
@@ -97,10 +90,6 @@ function DebitCardPage(props) {
             errors.addressState = 'addDebitCardPage.error.addressState';
         }
 
-        if (!Permissions.canUsePasswordlessLogins(props.betas) && (!values.password || _.isEmpty(values.password.trim()))) {
-            errors.password = 'addDebitCardPage.error.password';
-        }
-
         if (!values.acceptTerms) {
             errors.acceptTerms = 'common.error.acceptTerms';
         }
@@ -184,19 +173,6 @@ function DebitCardPage(props) {
                 <View style={styles.mt4}>
                     <StatePicker inputID="addressState" />
                 </View>
-                {!Permissions.canUsePasswordlessLogins(props.betas) && (
-                    <View style={[styles.mt4]}>
-                        <TextInput
-                            inputID="password"
-                            label={translate('addDebitCardPage.expensifyPassword')}
-                            accessibilityLabel={translate('addDebitCardPage.expensifyPassword')}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                            textContentType="password"
-                            autoCompleteType={ComponentUtils.PASSWORD_AUTOCOMPLETE_TYPE}
-                            secureTextEntry
-                        />
-                    </View>
-                )}
                 <CheckboxWithLabel
                     accessibilityLabel={`${translate('common.iAcceptThe')} ${translate('common.expensifyTermsOfService')}`}
                     inputID="acceptTerms"
@@ -220,7 +196,4 @@ export default withOnyx({
     formData: {
         key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
     },
-    betas: {
-        key: ONYXKEYS.BETAS,
-    },
 })(DebitCardPage);
diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 769cdb6e52df..912bf74250c1 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -1,11 +1,10 @@
 import React from 'react';
-import {ActivityIndicator, View, InteractionManager, LayoutAnimation} from 'react-native';
+import {ActivityIndicator, View, InteractionManager} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import PaymentMethodList from '../PaymentMethodList';
 import ROUTES from '../../../../ROUTES';
 import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
-import PasswordPopover from '../../../../components/PasswordPopover';
 import ScreenWrapper from '../../../../components/ScreenWrapper';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import styles from '../../../../styles/styles';
@@ -64,7 +63,6 @@ class BasePaymentsPage extends React.Component {
         this.hideDefaultDeleteMenu = this.hideDefaultDeleteMenu.bind(this);
         this.makeDefaultPaymentMethod = this.makeDefaultPaymentMethod.bind(this);
         this.deletePaymentMethod = this.deletePaymentMethod.bind(this);
-        this.hidePasswordPrompt = this.hidePasswordPrompt.bind(this);
         this.navigateToTransferBalancePage = this.navigateToTransferBalancePage.bind(this);
         this.setMenuPosition = this.setMenuPosition.bind(this);
         this.listHeaderComponent = this.listHeaderComponent.bind(this);
@@ -104,8 +102,6 @@ class BasePaymentsPage extends React.Component {
                 // Close corresponding selected payment method modals which are open
                 if (this.state.shouldShowDefaultDeleteMenu) {
                     this.hideDefaultDeleteMenu();
-                } else if (this.state.shouldShowPasswordPrompt) {
-                    this.hidePasswordPrompt();
                 }
             }
         }
@@ -290,27 +286,16 @@ class BasePaymentsPage extends React.Component {
         });
     }
 
-    hidePasswordPrompt(shouldClearSelectedData = true) {
-        this.setState({shouldShowPasswordPrompt: false});
-        if (shouldClearSelectedData) {
-            this.resetSelectedPaymentMethodData();
-        }
-
-        // Due to iOS modal freeze issue, password modal freezes the app when closed.
-        // LayoutAnimation undoes the running animation.
-        LayoutAnimation.configureNext(LayoutAnimation.create(50, LayoutAnimation.Types.easeInEaseOut, LayoutAnimation.Properties.opacity));
-    }
-
-    makeDefaultPaymentMethod(password = '') {
+    makeDefaultPaymentMethod() {
         // Find the previous default payment method so we can revert if the MakeDefaultPaymentMethod command errors
         const paymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList);
 
         const previousPaymentMethod = _.find(paymentMethods, (method) => method.isDefault);
         const currentPaymentMethod = _.find(paymentMethods, (method) => method.methodID === this.state.methodID);
         if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
-            PaymentMethods.makeDefaultPaymentMethod(password, this.state.selectedPaymentMethod.bankAccountID, null, previousPaymentMethod, currentPaymentMethod);
+            PaymentMethods.makeDefaultPaymentMethod(this.state.selectedPaymentMethod.bankAccountID, null, previousPaymentMethod, currentPaymentMethod);
         } else if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
-            PaymentMethods.makeDefaultPaymentMethod(password, null, this.state.selectedPaymentMethod.fundID, previousPaymentMethod, currentPaymentMethod);
+            PaymentMethods.makeDefaultPaymentMethod(null, this.state.selectedPaymentMethod.fundID, previousPaymentMethod, currentPaymentMethod);
         }
         this.resetSelectedPaymentMethodData();
     }
@@ -459,14 +444,7 @@ class BasePaymentsPage extends React.Component {
                                         // InteractionManager fires after the currently running animation is completed.
                                         // https://github.com/Expensify/App/issues/7768#issuecomment-1044879541
                                         InteractionManager.runAfterInteractions(() => {
-                                            if (Permissions.canUsePasswordlessLogins(this.props.betas)) {
-                                                this.makeDefaultPaymentMethod();
-                                            } else {
-                                                this.setState({
-                                                    shouldShowPasswordPrompt: true,
-                                                    passwordButtonText: this.props.translate('paymentsPage.setDefaultConfirmation'),
-                                                });
-                                            }
+                                            this.makeDefaultPaymentMethod();
                                         });
                                     }}
                                     text={this.props.translate('paymentsPage.setDefaultConfirmation')}
@@ -511,19 +489,6 @@ class BasePaymentsPage extends React.Component {
                         />
                     )}
                 </Popover>
-                <PasswordPopover
-                    isVisible={this.state.shouldShowPasswordPrompt}
-                    onClose={this.hidePasswordPrompt}
-                    anchorPosition={{
-                        top: this.state.anchorPositionTop,
-                        right: this.state.anchorPositionRight,
-                    }}
-                    onSubmit={(password) => {
-                        this.hidePasswordPrompt(false);
-                        this.makeDefaultPaymentMethod(password);
-                    }}
-                    submitButtonText={this.state.passwordButtonText}
-                />
             </ScreenWrapper>
         );
     }
diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
index 8a85c6857661..79772d426824 100644
--- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
+++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
@@ -13,7 +13,6 @@ import Text from '../../../../components/Text';
 import TextInput from '../../../../components/TextInput';
 import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
 import Navigation from '../../../../libs/Navigation/Navigation';
-import Permissions from '../../../../libs/Permissions';
 import ONYXKEYS from '../../../../ONYXKEYS';
 import ROUTES from '../../../../ROUTES';
 import styles from '../../../../styles/styles';
@@ -26,9 +25,6 @@ import CONST from '../../../../CONST';
 const propTypes = {
     /* Onyx Props */
 
-    /** List of betas available to current user */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
     /** Login list for the user that is signed in */
     loginList: PropTypes.shape({
         /** The partner creating the account. It depends on the source: website, mobile, integrations, ... */
@@ -50,7 +46,6 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 const defaultProps = {
-    betas: [],
     loginList: {},
 };
 
@@ -77,7 +72,7 @@ const addNewContactMethod = (values) => {
     const validateIfnumber = validateNumber(phoneLogin);
     const submitDetail = (validateIfnumber || values.phoneOrEmail).trim().toLowerCase();
 
-    User.addNewContactMethodAndNavigate(submitDetail, values.password);
+    User.addNewContactMethodAndNavigate(submitDetail);
 };
 
 function NewContactMethodPage(props) {
@@ -102,10 +97,6 @@ function NewContactMethodPage(props) {
                 ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', 'contacts.genericFailureMessages.enteredMethodIsAlreadySubmited');
             }
 
-            if (!Permissions.canUsePasswordlessLogins(props.betas) && _.isEmpty(values.password)) {
-                errors.password = 'contacts.genericFailureMessages.passwordRequired';
-            }
-
             return errors;
         },
         // We don't need `props.loginList` because when submitting this form
@@ -148,21 +139,10 @@ function NewContactMethodPage(props) {
                         ref={(el) => (loginInputRef.current = el)}
                         inputID="phoneOrEmail"
                         autoCapitalize="none"
-                        returnKeyType={Permissions.canUsePasswordlessLogins(props.betas) ? 'done' : 'next'}
+                        returnKeyType="done"
                         maxLength={CONST.LOGIN_CHARACTER_LIMIT}
                     />
                 </View>
-                {!Permissions.canUsePasswordlessLogins(props.betas) && (
-                    <View style={[styles.mb6]}>
-                        <TextInput
-                            label={props.translate('common.password')}
-                            accessibilityLabel={props.translate('common.password')}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                            inputID="password"
-                            returnKeyType="done"
-                        />
-                    </View>
-                )}
             </Form>
         </ScreenWrapper>
     );
@@ -174,7 +154,6 @@ NewContactMethodPage.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withOnyx({
-        betas: {key: ONYXKEYS.BETAS},
         loginList: {key: ONYXKEYS.LOGIN_LIST},
     }),
 )(NewContactMethodPage);
diff --git a/src/pages/settings/Security/SecuritySettingsPage.js b/src/pages/settings/Security/SecuritySettingsPage.js
index f86dee56d2c5..65fa265c425a 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.js
+++ b/src/pages/settings/Security/SecuritySettingsPage.js
@@ -45,13 +45,6 @@ function SecuritySettingsPage(props) {
                 }
             },
         },
-        {
-            translationKey: 'passwordPage.changePassword',
-            icon: Expensicons.Key,
-            action: () => {
-                Navigation.navigate(ROUTES.SETTINGS_PASSWORD);
-            },
-        },
         {
             translationKey: 'closeAccountPage.closeAccount',
             icon: Expensicons.ClosedSign,
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index 4386ad5842da..b73ee6123046 100644
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -218,7 +218,7 @@ function LoginForm(props) {
             )}
             {
                 // We need to unmount the submit button when the component is not visible so that the Enter button
-                // key handler gets unsubscribed and does not conflict with the Password Form
+                // key handler gets unsubscribed
                 props.isVisible && (
                     <View style={[styles.mt5]}>
                         <FormAlertWithSubmitButton
diff --git a/src/pages/signin/PasswordForm.js b/src/pages/signin/PasswordForm.js
deleted file mode 100644
index 205da5b2fa13..000000000000
--- a/src/pages/signin/PasswordForm.js
+++ /dev/null
@@ -1,272 +0,0 @@
-import React, {useState, useEffect, useCallback, useRef} from 'react';
-import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
-import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
-import themeColors from '../../styles/themes/default';
-import * as Session from '../../libs/actions/Session';
-import ONYXKEYS from '../../ONYXKEYS';
-import CONST from '../../CONST';
-import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import compose from '../../libs/compose';
-import TextInput from '../../components/TextInput';
-import * as ComponentUtils from '../../libs/ComponentUtils';
-import * as ValidationUtils from '../../libs/ValidationUtils';
-import withToggleVisibilityView, {toggleVisibilityViewPropTypes} from '../../components/withToggleVisibilityView';
-import canFocusInputOnScreenFocus from '../../libs/canFocusInputOnScreenFocus';
-import * as ErrorUtils from '../../libs/ErrorUtils';
-import {withNetwork} from '../../components/OnyxProvider';
-import networkPropTypes from '../../components/networkPropTypes';
-import FormHelpMessage from '../../components/FormHelpMessage';
-import Terms from './Terms';
-import PressableWithFeedback from '../../components/Pressable/PressableWithFeedback';
-
-const propTypes = {
-    /* Onyx Props */
-
-    /** The details about the account that the user is signing in with */
-    account: PropTypes.shape({
-        /** Whether or not two-factor authentication is required */
-        requiresTwoFactorAuth: PropTypes.bool,
-
-        /** Whether or not a sign on form is loading (being submitted) */
-        isLoading: PropTypes.bool,
-    }),
-
-    /** Indicates which locale the user currently has selected */
-    preferredLocale: PropTypes.string,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
-    ...withLocalizePropTypes,
-    ...toggleVisibilityViewPropTypes,
-};
-
-const defaultProps = {
-    account: {},
-    preferredLocale: CONST.LOCALES.DEFAULT,
-};
-
-function PasswordForm(props) {
-    const [formError, setFormError] = useState({});
-    const [password, setPassword] = useState('');
-    const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
-
-    const inputPasswordRef = useRef(null);
-    const input2FA = useRef(null);
-
-    /**
-     * Handle text input and clear formError upon text change
-     *
-     * @param {String} text
-     * @param {String} key
-     */
-    const onTextInput = (text, key) => {
-        if (key === 'password') {
-            setPassword(text);
-        }
-        if (key === 'twoFactorAuthCode') {
-            setTwoFactorAuthCode(text);
-        }
-        setFormError({[key]: ''});
-
-        if (props.account.errors) {
-            Session.clearAccountMessages();
-        }
-    };
-
-    /**
-     * Clear Password from the state
-     */
-    const clearPassword = () => {
-        setPassword('');
-        inputPasswordRef.current.clear();
-    };
-
-    /**
-     * Trigger the reset password flow and ensure the 2FA input field is reset to avoid it being permanently hidden
-     */
-    const resetPassword = () => {
-        if (input2FA.current) {
-            setTwoFactorAuthCode('');
-            input2FA.current.clear();
-        }
-        setFormError({});
-        Session.resetPassword();
-    };
-
-    /**
-     * Clears local and Onyx sign in states
-     */
-    const clearSignInData = () => {
-        setTwoFactorAuthCode('');
-        setFormError({});
-        Session.clearSignInData();
-    };
-
-    /**
-     * Check that all the form fields are valid, then trigger the submit callback
-     */
-    const validateAndSubmitForm = useCallback(() => {
-        const passwordTrimmed = password.trim();
-        const twoFactorCodeTrimmed = twoFactorAuthCode.trim();
-        const requiresTwoFactorAuth = props.account.requiresTwoFactorAuth;
-
-        if (!passwordTrimmed) {
-            setFormError({password: 'passwordForm.pleaseFillPassword'});
-            return;
-        }
-
-        if (!ValidationUtils.isValidPassword(passwordTrimmed)) {
-            setFormError({password: 'passwordForm.error.incorrectPassword'});
-            return;
-        }
-
-        if (requiresTwoFactorAuth && !twoFactorCodeTrimmed) {
-            setFormError({twoFactorAuthCode: 'passwordForm.pleaseFillTwoFactorAuth'});
-            return;
-        }
-
-        if (requiresTwoFactorAuth && !ValidationUtils.isValidTwoFactorCode(twoFactorCodeTrimmed)) {
-            setFormError({twoFactorAuthCode: 'passwordForm.error.incorrect2fa'});
-            return;
-        }
-
-        setFormError({});
-
-        Session.signIn(passwordTrimmed, '', twoFactorCodeTrimmed, props.preferredLocale);
-    }, [password, twoFactorAuthCode, props.account.requiresTwoFactorAuth, props.preferredLocale]);
-
-    useEffect(() => {
-        if (!canFocusInputOnScreenFocus() || !inputPasswordRef.current || !props.isVisible) {
-            return;
-        }
-        inputPasswordRef.current.focus();
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
-    }, []);
-
-    useEffect(() => {
-        if (props.isVisible) {
-            inputPasswordRef.current.focus();
-        }
-        if (!props.isVisible) {
-            clearPassword();
-        }
-    }, [props.isVisible]);
-
-    useEffect(() => {
-        if (!props.account.requiresTwoFactorAuth) {
-            return;
-        }
-        input2FA.current.focus();
-    }, [props.account.requiresTwoFactorAuth]);
-
-    useEffect(() => {
-        if (twoFactorAuthCode.length !== CONST.TFA_CODE_LENGTH) {
-            return;
-        }
-        validateAndSubmitForm();
-    }, [twoFactorAuthCode, validateAndSubmitForm]);
-
-    const isTwoFactorAuthRequired = Boolean(props.account.requiresTwoFactorAuth);
-    const hasServerError = Boolean(props.account) && !_.isEmpty(props.account.errors);
-
-    // When the 2FA required flag is set, user has already passed/completed the password field
-    const passwordFieldHasError = !isTwoFactorAuthRequired && hasServerError;
-    const twoFactorFieldHasError = isTwoFactorAuthRequired && hasServerError;
-
-    return (
-        <>
-            <View style={[styles.mv3]}>
-                <TextInput
-                    ref={inputPasswordRef}
-                    label={props.translate('common.password')}
-                    accessibilityLabel={props.translate('common.password')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    secureTextEntry
-                    autoCompleteType={ComponentUtils.PASSWORD_AUTOCOMPLETE_TYPE}
-                    textContentType="password"
-                    nativeID="password"
-                    name="password"
-                    value={password}
-                    onChangeText={(text) => onTextInput(text, 'password')}
-                    onSubmitEditing={validateAndSubmitForm}
-                    blurOnSubmit={false}
-                    errorText={formError.password ? props.translate(formError.password) : ''}
-                    hasError={passwordFieldHasError}
-                />
-                <View style={[styles.changeExpensifyLoginLinkContainer]}>
-                    <PressableWithFeedback
-                        style={[styles.mt2]}
-                        onPress={resetPassword}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
-                        accessibilityLabel={props.translate('passwordForm.forgot')}
-                        hoverDimmingValue={1}
-                    >
-                        <Text style={[styles.link]}>{props.translate('passwordForm.forgot')}</Text>
-                    </PressableWithFeedback>
-                </View>
-            </View>
-
-            {isTwoFactorAuthRequired && (
-                <View style={[styles.mv3]}>
-                    <TextInput
-                        ref={input2FA}
-                        label={props.translate('common.twoFactorCode')}
-                        accessibilityLabel={props.translate('common.twoFactorCode')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        value={twoFactorAuthCode}
-                        placeholder={props.translate('passwordForm.requiredWhen2FAEnabled')}
-                        placeholderTextColor={themeColors.placeholderText}
-                        onChangeText={(text) => onTextInput(text, 'twoFactorAuthCode')}
-                        onSubmitEditing={validateAndSubmitForm}
-                        keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
-                        blurOnSubmit={false}
-                        maxLength={CONST.TFA_CODE_LENGTH}
-                        errorText={formError.twoFactorAuthCode ? props.translate(formError.twoFactorAuthCode) : ''}
-                        hasError={twoFactorFieldHasError}
-                    />
-                </View>
-            )}
-
-            {hasServerError && <FormHelpMessage message={ErrorUtils.getLatestErrorMessage(props.account)} />}
-
-            <View>
-                <Button
-                    isDisabled={props.network.isOffline}
-                    success
-                    style={[styles.mv3]}
-                    text={props.translate('common.signIn')}
-                    isLoading={
-                        props.account.isLoading && props.account.loadingForm === (props.account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM)
-                    }
-                    onPress={validateAndSubmitForm}
-                />
-                <ChangeExpensifyLoginLink onPress={clearSignInData} />
-            </View>
-
-            <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
-                <Terms />
-            </View>
-        </>
-    );
-}
-
-PasswordForm.propTypes = propTypes;
-PasswordForm.defaultProps = defaultProps;
-PasswordForm.displayName = 'PasswordForm';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        account: {key: ONYXKEYS.ACCOUNT},
-        preferredLocale: {key: ONYXKEYS.NVP_PREFERRED_LOCALE},
-    }),
-    withToggleVisibilityView,
-    withNetwork(),
-)(PasswordForm);
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
deleted file mode 100755
index aea03469e938..000000000000
--- a/src/pages/signin/ResendValidationForm.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import React from 'react';
-import _ from 'underscore';
-import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import PropTypes from 'prop-types';
-import Str from 'expensify-common/lib/str';
-import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
-import * as Session from '../../libs/actions/Session';
-import ONYXKEYS from '../../ONYXKEYS';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import compose from '../../libs/compose';
-import redirectToSignIn from '../../libs/actions/SignInRedirect';
-import Avatar from '../../components/Avatar';
-import * as UserUtils from '../../libs/UserUtils';
-import networkPropTypes from '../../components/networkPropTypes';
-import {withNetwork} from '../../components/OnyxProvider';
-import DotIndicatorMessage from '../../components/DotIndicatorMessage';
-import PressableWithFeedback from '../../components/Pressable/PressableWithFeedback';
-import CONST from '../../CONST';
-
-const propTypes = {
-    /* Onyx Props */
-
-    /** The credentials of the logged in person */
-    credentials: PropTypes.shape({
-        /** The email/phone the user logged in with */
-        login: PropTypes.string,
-    }),
-
-    /** The details about the account that the user is signing in with */
-    account: PropTypes.shape({
-        /** Whether or not a sign on form is loading (being submitted) */
-        loading: PropTypes.bool,
-
-        /** Whether or not the account is validated */
-        validated: PropTypes.bool,
-    }),
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    credentials: {},
-    account: {},
-};
-
-function ResendValidationForm(props) {
-    const isSMSLogin = Str.isSMSLogin(props.credentials.login);
-
-    // replacing spaces with "hard spaces" to prevent breaking the number
-    const login = isSMSLogin ? props.formatPhoneNumber(props.credentials.login).replace(/ /g, '\u00A0') : props.credentials.login;
-
-    const loginType = (isSMSLogin ? props.translate('common.phone') : props.translate('common.email')).toLowerCase();
-
-    return (
-        <>
-            <View style={[styles.mt3, styles.flexRow, styles.alignItemsCenter, styles.justifyContentStart]}>
-                <Avatar
-                    source={UserUtils.getDefaultAvatar(props.credentials.login)}
-                    imageStyles={[styles.mr2]}
-                />
-                <View style={[styles.flex1]}>
-                    <Text
-                        textBreakStrategy="simple"
-                        style={[styles.textStrong]}
-                    >
-                        {login}
-                    </Text>
-                </View>
-            </View>
-            <View style={[styles.mv5]}>
-                <Text>{props.translate('resendValidationForm.weSentYouMagicSignInLink', {login, loginType})}</Text>
-            </View>
-            {!_.isEmpty(props.account.message) && (
-                // DotIndicatorMessage mostly expects onyxData errors so we need to mock an object so that the messages looks similar to prop.account.errors
-                <DotIndicatorMessage
-                    style={[styles.mb5, styles.flex0]}
-                    type="success"
-                    messages={{0: props.account.message}}
-                />
-            )}
-            {!_.isEmpty(props.account.errors) && (
-                <DotIndicatorMessage
-                    style={[styles.mb5]}
-                    type="error"
-                    messages={props.account.errors}
-                />
-            )}
-            <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                <PressableWithFeedback
-                    onPress={() => redirectToSignIn()}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                    accessibilityLabel={props.translate('common.back')}
-                    // disable hover dim for switch
-                    hoverDimmingValue={1}
-                    pressDimmingValue={0.2}
-                >
-                    <Text style={[styles.link]}>{props.translate('common.back')}</Text>
-                </PressableWithFeedback>
-                <Button
-                    medium
-                    success
-                    text={props.translate('resendValidationForm.resendLink')}
-                    isLoading={props.account.isLoading && props.account.loadingForm === CONST.FORMS.RESEND_VALIDATION_FORM}
-                    onPress={() => (props.account.validated ? Session.resendResetPassword() : Session.resendValidationLink())}
-                    isDisabled={props.network.isOffline}
-                />
-            </View>
-        </>
-    );
-}
-
-ResendValidationForm.propTypes = propTypes;
-ResendValidationForm.defaultProps = defaultProps;
-ResendValidationForm.displayName = 'ResendValidationForm';
-
-export default compose(
-    withLocalize,
-    withNetwork(),
-    withOnyx({
-        credentials: {key: ONYXKEYS.CREDENTIALS},
-        account: {key: ONYXKEYS.ACCOUNT},
-    }),
-)(ResendValidationForm);
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 9cc8c074ae16..3e7f96038953 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -9,9 +9,7 @@ import ONYXKEYS from '../../ONYXKEYS';
 import styles from '../../styles/styles';
 import SignInPageLayout from './SignInPageLayout';
 import LoginForm from './LoginForm';
-import PasswordForm from './PasswordForm';
 import ValidateCodeForm from './ValidateCodeForm';
-import ResendValidationForm from './ResendValidationForm';
 import Performance from '../../libs/Performance';
 import * as App from '../../libs/actions/App';
 import UnlinkLoginForm from './UnlinkLoginForm';
@@ -19,7 +17,6 @@ import EmailDeliveryFailurePage from './EmailDeliveryFailurePage';
 import * as Localize from '../../libs/Localize';
 import * as StyleUtils from '../../styles/StyleUtils';
 import useLocalize from '../../hooks/useLocalize';
-import usePermissions from '../../hooks/usePermissions';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import Log from '../../libs/Log';
 
@@ -35,9 +32,6 @@ const propTypes = {
         /** The primaryLogin associated with the account */
         primaryLogin: PropTypes.string,
 
-        /** Has the user pressed the forgot password button? */
-        forgotPassword: PropTypes.bool,
-
         /** Does this account require 2FA? */
         requiresTwoFactorAuth: PropTypes.bool,
 
@@ -48,7 +42,6 @@ const propTypes = {
     /** The credentials of the person signing in */
     credentials: PropTypes.shape({
         login: PropTypes.string,
-        password: PropTypes.string,
         twoFactorAuthCode: PropTypes.string,
         validateCode: PropTypes.string,
     }),
@@ -61,33 +54,24 @@ const defaultProps = {
 
 /**
  * @param {Boolean} hasLogin
- * @param {Boolean} hasPassword
  * @param {Boolean} hasValidateCode
  * @param {Boolean} isPrimaryLogin
  * @param {Boolean} isAccountValidated
- * @param {Boolean} didForgetPassword
- * @param {Boolean} canUsePasswordlessLogins
  * @param {Boolean} hasEmailDeliveryFailure
  * @returns {Object}
  */
-function getRenderOptions({hasLogin, hasPassword, hasValidateCode, hasAccount, isPrimaryLogin, isAccountValidated, didForgetPassword, canUsePasswordlessLogins, hasEmailDeliveryFailure}) {
+function getRenderOptions({hasLogin, hasValidateCode, hasAccount, isPrimaryLogin, isAccountValidated, hasEmailDeliveryFailure}) {
     const shouldShowLoginForm = !hasLogin && !hasValidateCode;
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure;
-    const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !isAccountValidated && !shouldShowEmailDeliveryFailurePage;
-    const shouldShowPasswordForm =
-        hasLogin && isAccountValidated && !hasPassword && !didForgetPassword && !isUnvalidatedSecondaryLogin && !canUsePasswordlessLogins && !shouldShowEmailDeliveryFailurePage;
-    const shouldShowValidateCodeForm = hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && canUsePasswordlessLogins && !shouldShowEmailDeliveryFailurePage;
-    const shouldShowResendValidationForm =
-        hasLogin && (!isAccountValidated || didForgetPassword) && !isUnvalidatedSecondaryLogin && !canUsePasswordlessLogins && !shouldShowEmailDeliveryFailurePage;
-    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowPasswordForm || shouldShowValidateCodeForm || isUnvalidatedSecondaryLogin || shouldShowEmailDeliveryFailurePage;
-    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowPasswordForm || shouldShowValidateCodeForm;
+    const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !isAccountValidated;
+    const shouldShowValidateCodeForm = hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin;
+    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || isUnvalidatedSecondaryLogin;
+    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm;
     return {
         shouldShowLoginForm,
         shouldShowEmailDeliveryFailurePage,
         shouldShowUnlinkLoginForm: isUnvalidatedSecondaryLogin,
-        shouldShowPasswordForm,
         shouldShowValidateCodeForm,
-        shouldShowResendValidationForm,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
     };
@@ -95,7 +79,6 @@ function getRenderOptions({hasLogin, hasPassword, hasValidateCode, hasAccount, i
 
 function SignInPage({credentials, account}) {
     const {translate, formatPhoneNumber} = useLocalize();
-    const {canUsePasswordlessLogins} = usePermissions();
     const {isSmallScreenWidth} = useWindowDimensions();
     const safeAreaInsets = useSafeAreaInsets();
 
@@ -104,30 +87,23 @@ function SignInPage({credentials, account}) {
         App.setLocale(Localize.getDevicePreferredLocale());
     }, []);
 
-    const {
-        shouldShowLoginForm,
-        shouldShowEmailDeliveryFailurePage,
-        shouldShowUnlinkLoginForm,
-        shouldShowPasswordForm,
-        shouldShowValidateCodeForm,
-        shouldShowResendValidationForm,
-        shouldShowWelcomeHeader,
-        shouldShowWelcomeText,
-    } = getRenderOptions({
-        hasLogin: Boolean(credentials.login),
-        hasPassword: Boolean(credentials.password),
-        hasValidateCode: Boolean(credentials.validateCode),
-        hasAccount: !_.isEmpty(account),
-        isPrimaryLogin: !account.primaryLogin || account.primaryLogin === credentials.login,
-        isAccountValidated: Boolean(account.validated),
-        didForgetPassword: Boolean(account.forgotPassword),
-        canUsePasswordlessLogins,
-        hasEmailDeliveryFailure: Boolean(account.hasEmailDeliveryFailure),
-    });
+    const {shouldShowLoginForm, shouldShowEmailDeliveryFailurePage, shouldShowUnlinkLoginForm, shouldShowValidateCodeForm, shouldShowWelcomeHeader, shouldShowWelcomeText} = getRenderOptions(
+        {
+            hasLogin: Boolean(credentials.login),
+            hasValidateCode: Boolean(credentials.validateCode),
+            hasAccount: !_.isEmpty(account),
+            isPrimaryLogin: !account.primaryLogin || account.primaryLogin === credentials.login,
+            isAccountValidated: Boolean(account.validated),
+            hasEmailDeliveryFailure: Boolean(account.hasEmailDeliveryFailure),
+        },
+    );
 
     let welcomeHeader;
     let welcomeText;
-    if (shouldShowValidateCodeForm || shouldShowResendValidationForm) {
+    if (shouldShowLoginForm) {
+        welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.getStarted');
+        welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
+    } else if (shouldShowValidateCodeForm) {
         if (account.requiresTwoFactorAuth) {
             // We will only know this after a user signs in successfully, without their 2FA code
             welcomeHeader = isSmallScreenWidth ? '' : translate('welcomeText.welcomeBack');
@@ -149,9 +125,6 @@ function SignInPage({credentials, account}) {
                     : translate('welcomeText.newFaceEnterMagicCode', {login: userLoginToDisplay});
             }
         }
-    } else if (shouldShowPasswordForm) {
-        welcomeHeader = isSmallScreenWidth ? '' : translate('welcomeText.welcomeBack');
-        welcomeText = isSmallScreenWidth ? `${translate('welcomeText.welcomeBack')} ${translate('welcomeText.enterPassword')}` : translate('welcomeText.enterPassword');
     } else if (shouldShowUnlinkLoginForm || shouldShowEmailDeliveryFailurePage) {
         welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.welcomeBack');
 
@@ -159,9 +132,6 @@ function SignInPage({credentials, account}) {
         if (shouldShowEmailDeliveryFailurePage) {
             welcomeText = '';
         }
-    } else if (!shouldShowResendValidationForm) {
-        welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.getStarted');
-        welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
     } else {
         Log.warn('SignInPage in unexpected state!');
     }
@@ -176,14 +146,13 @@ function SignInPage({credentials, account}) {
                 shouldShowWelcomeHeader={shouldShowWelcomeHeader || !isSmallScreenWidth}
                 shouldShowWelcomeText={shouldShowWelcomeText}
             >
-                {/* LoginForm and PasswordForm must use the isVisible prop. This keeps them mounted, but visually hidden
-                    so that password managers can access the values. Conditionally rendering these components will break this feature. */}
+                {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
+                    so that password managers can access the values. Conditionally rendering this component will break this feature. */}
                 <LoginForm
                     isVisible={shouldShowLoginForm}
                     blurOnSubmit={account.validated === false}
                 />
-                {shouldShowValidateCodeForm ? <ValidateCodeForm /> : <PasswordForm isVisible={shouldShowPasswordForm} />}
-                {shouldShowResendValidationForm && <ResendValidationForm />}
+                {shouldShowValidateCodeForm && <ValidateCodeForm />}
                 {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
                 {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
             </SignInPageLayout>
diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 845a6947ca48..59095715dc1b 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -19,11 +19,11 @@ const propTypes = {
     children: PropTypes.node.isRequired,
 
     /** Welcome text to show in the header of the form, changes depending
-     * on form type (set password, sign in, etc.) */
+     * on form type (for example, sign in) */
     welcomeText: PropTypes.string.isRequired,
 
     /** Welcome header to show in the header of the form, changes depending
-     * on form type (set password, sign in, etc.) and small vs large screens */
+     * on form type (for example. sign in) and small vs large screens */
     welcomeHeader: PropTypes.string.isRequired,
 
     /** Whether to show welcome text on a particular page */
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 3175d8b485c6..7acd08a6c693 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -22,11 +22,11 @@ const propTypes = {
     children: PropTypes.node.isRequired,
 
     /** Welcome text to show in the header of the form, changes depending
-     * on form type (set password, sign in, etc.) */
+     * on form type (for example, sign in) */
     welcomeText: PropTypes.string.isRequired,
 
     /** Welcome header to show in the header of the form, changes depending
-     * on form type (set password, sign in, etc.) and small vs large screens */
+     * on form type (for example, sign in) and small vs large screens */
     welcomeHeader: PropTypes.string.isRequired,
 
     /** Whether to show welcome text on a particular page */
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index 9abbf5ea4957..04a86ea9b92f 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -226,7 +226,7 @@ function BaseValidateCodeForm(props) {
         if (accountID) {
             Session.signInWithValidateCode(accountID, validateCode, props.preferredLocale, twoFactorAuthCode);
         } else {
-            Session.signIn('', validateCode, twoFactorAuthCode, props.preferredLocale);
+            Session.signIn(validateCode, twoFactorAuthCode, props.preferredLocale);
         }
     }, [props.account.requiresTwoFactorAuth, props.credentials, props.preferredLocale, twoFactorAuthCode, validateCode]);