diff --git a/frontend/src/components/Register/RegisterForm.tsx b/frontend/src/components/Register/RegisterForm.tsx
index 7b954b885..5b58525ba 100644
--- a/frontend/src/components/Register/RegisterForm.tsx
+++ b/frontend/src/components/Register/RegisterForm.tsx
@@ -253,6 +253,7 @@ export const RegisterForm: React.FC<{
           value={values.email}
           onChange={onTextChange}
           helperText={errorEmailMessage ? errorEmailMessage : null}
+          autoFocus
         />
         <TextField
           margin="dense"
diff --git a/frontend/src/pages/AuthLogin/AuthLogin.tsx b/frontend/src/pages/AuthLogin/AuthLogin.tsx
index 8693ca8b4..44f47e4ec 100644
--- a/frontend/src/pages/AuthLogin/AuthLogin.tsx
+++ b/frontend/src/pages/AuthLogin/AuthLogin.tsx
@@ -2,26 +2,18 @@ import React, { useEffect, useState } from 'react';
 import { AuthForm } from 'components';
 import { useAuthContext } from 'context';
 import { Button } from '@trussworks/react-uswds';
-// import { Alert, AlertTitle, Box, Grid, Link, Typography } from '@mui/material';
 import { Box, Grid, Link, Typography } from '@mui/material';
 import { RegisterForm } from 'components/Register/RegisterForm';
 import { CrossfeedWarning } from 'components/WarningBanner';
-import {
-  Authenticator,
-  // ThemeProvider,
-  useAuthenticator
-} from '@aws-amplify/ui-react';
+import { Authenticator, useAuthenticator } from '@aws-amplify/ui-react';
 import { I18n } from 'aws-amplify';
 
 const TOTP_ISSUER = process.env.REACT_APP_TOTP_ISSUER;
-// Strings come from https://github.com/aws-amplify/amplify-ui/blob/main/packages/ui/src/i18n/dictionaries/authenticator/en.ts
 I18n.putVocabulariesForLanguage('en-US', {
   'Setup TOTP': 'Set up 2FA',
   'Confirm TOTP Code': 'Enter 2FA Code'
 });
-// const amplifyTheme = {
-//   name: 'my-theme'
-// };
+
 interface Errors extends Partial<FormData> {
   global?: string;
 }
@@ -36,15 +28,48 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({
   useEffect(() => {
     refreshUser();
   }, [refreshUser, authStatus]);
+
   const formFields = {
+    signIn: {
+      username: {
+        label: 'Email',
+        placeholder: 'Enter your email address',
+        required: true,
+        autoFocus: true
+      },
+      password: {
+        label: 'Password',
+        placeholder: 'Enter your password',
+        required: true
+      }
+    },
     confirmSignIn: {
       confirmation_code: {
-        label: 'Enter 2FA Code from your authenticator app'
+        label: 'Confirmation Code',
+        placeholder: 'Enter code from your authenticator app',
+        autoFocus: true
+      }
+    },
+    resetPassword: {
+      username: {
+        label: 'Email',
+        placeholder: 'Enter your email address',
+        required: true,
+        autoFocus: true
       }
     },
     confirmResetPassword: {
       confirmation_code: {
-        label: 'Enter code sent to your email address'
+        label: 'Confirmation Code',
+        placeholder: 'Enter code sent to your email address',
+        autoFocus: true
+      }
+    },
+    confirmSignUp: {
+      confirmation_code: {
+        label: 'Confirmation Code',
+        placeholder: 'Enter code sent to your email address',
+        autoFocus: true
       }
     },
     setupTOTP: {
@@ -52,14 +77,15 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({
         // Set the issuer and name so that the authenticator app shows them.
         // TODO: Set the issuer to the email, once this is resolved: https://github.com/aws-amplify/amplify-ui/issues/3387.
         totpIssuer: TOTP_ISSUER
-        // totpUsername: email,
       },
       confirmation_code: {
         label:
-          'Set up 2FA by scanning the QR code with an authenticator app on your phone.'
+          'Set up 2FA by scanning the QR code with an authenticator app on your phone.',
+        autoFocus: true
       }
     }
   };
+
   const onSubmit: React.FormEventHandler = async (e) => {
     e.preventDefault();
     try {
@@ -115,6 +141,7 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({
             /* hideSignUp={
                 !showSignUp && !(process.env.NODE_ENV === 'development')
               }*/
+            // Hide sign up button unless we are in development mode.
             hideSignUp={true}
           />
         </Grid>
diff --git a/frontend/src/pages/AuthLogin/AuthLoginCreate.tsx b/frontend/src/pages/AuthLogin/AuthLoginCreate.tsx
index e20ac16de..99b42a397 100644
--- a/frontend/src/pages/AuthLogin/AuthLoginCreate.tsx
+++ b/frontend/src/pages/AuthLogin/AuthLoginCreate.tsx
@@ -42,14 +42,46 @@ export const AuthLoginCreate: React.FC<{ showSignUp?: boolean }> = ({
   }, [refreshUser, authStatus]);
 
   const formFields = {
+    signIn: {
+      username: {
+        label: 'Email',
+        placeholder: 'Enter your email address',
+        required: true,
+        autoFocus: true
+      },
+      password: {
+        label: 'Password',
+        placeholder: 'Enter your password',
+        required: true
+      }
+    },
     confirmSignIn: {
       confirmation_code: {
-        label: 'Enter 2FA Code from your authenticator app'
+        label: 'Confirmation Code',
+        placeholder: 'Enter code from your authenticator app',
+        autoFocus: true
+      }
+    },
+    resetPassword: {
+      username: {
+        label: 'Email',
+        placeholder: 'Enter your email address',
+        required: true,
+        autoFocus: true
       }
     },
     confirmResetPassword: {
       confirmation_code: {
-        label: 'Enter code sent to your email address'
+        label: 'Confirmation Code',
+        placeholder: 'Enter code sent to your email address',
+        autoFocus: true
+      }
+    },
+    confirmSignUp: {
+      confirmation_code: {
+        label: 'Confirmation Code',
+        placeholder: 'Enter code sent to your email address',
+        autoFocus: true
       }
     },
     setupTOTP: {
@@ -61,7 +93,8 @@ export const AuthLoginCreate: React.FC<{ showSignUp?: boolean }> = ({
       },
       confirmation_code: {
         label:
-          'Set up 2FA by scanning the QR code with an authenticator app on your phone.'
+          'Set up 2FA by scanning the QR code with an authenticator app on your phone.',
+        autoFocus: true
       }
     }
   };
@@ -94,7 +127,6 @@ export const AuthLoginCreate: React.FC<{ showSignUp?: boolean }> = ({
 
         <ThemeProvider theme={amplifyTheme}>
           <Authenticator
-            loginMechanisms={['email']}
             formFields={formFields}
             /* Hide the sign up button unless we are 1) on the /signup page or 2) in development mode. */
             hideSignUp={
diff --git a/frontend/src/pages/AuthLogin/AuthLoginOld.tsx b/frontend/src/pages/AuthLogin/AuthLoginOld.tsx
deleted file mode 100644
index d9e7f4e6e..000000000
--- a/frontend/src/pages/AuthLogin/AuthLoginOld.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
-import { AuthForm } from 'components';
-import { Button } from '@trussworks/react-uswds';
-import { useAuthContext } from 'context';
-import {
-  Authenticator,
-  ThemeProvider,
-  useAuthenticator
-} from '@aws-amplify/ui-react';
-import { I18n } from 'aws-amplify';
-
-const TOTP_ISSUER = process.env.REACT_APP_TOTP_ISSUER;
-
-// Strings come from https://github.com/aws-amplify/amplify-ui/blob/main/packages/ui/src/i18n/dictionaries/authenticator/en.ts
-I18n.putVocabulariesForLanguage('en-US', {
-  'Setup TOTP': 'Set up 2FA',
-  'Confirm TOTP Code': 'Enter 2FA Code'
-});
-
-const amplifyTheme = {
-  name: 'my-theme'
-};
-
-interface Errors extends Partial<FormData> {
-  global?: string;
-}
-
-export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({
-  showSignUp = false
-}) => {
-  const { apiPost, refreshUser } = useAuthContext();
-  const [errors, setErrors] = useState<Errors>({});
-
-  // Once a user signs in, call refreshUser() so that the callback is called and the user gets signed in.
-  const { authStatus } = useAuthenticator((context) => [context.isPending]);
-  useEffect(() => {
-    refreshUser();
-  }, [refreshUser, authStatus]);
-
-  const formFields = {
-    confirmSignIn: {
-      confirmation_code: {
-        label: 'Enter 2FA Code from your authenticator app'
-      }
-    },
-    confirmResetPassword: {
-      confirmation_code: {
-        label: 'Enter code sent to your email address'
-      }
-    },
-    setupTOTP: {
-      QR: {
-        // Set the issuer and name so that the authenticator app shows them.
-        // TODO: Set the issuer to the email, once this is resolved: https://github.com/aws-amplify/amplify-ui/issues/3387.
-        totpIssuer: TOTP_ISSUER
-        // totpUsername: email,
-      },
-      confirmation_code: {
-        label:
-          'Set up 2FA by scanning the QR code with an authenticator app on your phone.'
-      }
-    }
-  };
-
-  const onSubmit: React.FormEventHandler = async (e) => {
-    e.preventDefault();
-    try {
-      const { redirectUrl, state, nonce } = await apiPost('/auth/login', {
-        body: {}
-      });
-      localStorage.setItem('state', state);
-      localStorage.setItem('nonce', nonce);
-      window.location.href = redirectUrl;
-    } catch (e) {
-      console.error(e);
-      setErrors({
-        global: 'Something went wrong logging in.'
-      });
-    }
-  };
-
-  if (process.env.REACT_APP_USE_COGNITO) {
-    return (
-      <AuthForm as="div">
-        <h1>Welcome to Crossfeed</h1>
-        <ThemeProvider theme={amplifyTheme}>
-          <Authenticator
-            loginMechanisms={['email']}
-            formFields={formFields}
-            /* Hide the sign up button unless we are 1) on the /signup page or 2) in development mode. */
-            hideSignUp={
-              !showSignUp && !(process.env.NODE_ENV === 'development')
-            }
-          />
-          <div className="notification_box">
-            <div className="platform_header">PLATFORM NOTIFICATION</div>
-            <div className="notification_header">
-              Important Notice: Temporary Downtime During Crossfeed Migration
-            </div>
-            <div className="temp_notification">
-              {' '}
-              The Crossfeed environment is moving. The migration will require a
-              temporary downtime of approximately one week.
-            </div>
-            <div className="temp_notification">
-              {' '}
-              The downtime will begin on Wednesday, October 25, through the end
-              of day Wednesday, November 01.{' '}
-            </div>
-            <div className="temp_notification">
-              For additional information, please click{' '}
-              <a href="https://s3.amazonaws.com/crossfeed.cyber.dhs.gov/Notice.pdf">
-                here.
-              </a>
-            </div>
-          </div>
-          <div className="banner_box">
-            <div className="banner_header">**Warning**</div>
-            <div className="banner_login">
-              {' '}
-              This system contains U.S. Government Data. Unauthorized use of
-              this system is prohibited. Use of this computer system, authorized
-              or unauthorized, constitutes consent to monitoring of this system.
-            </div>
-            <div className="banner_login">
-              {' '}
-              This computer system, including all related equipment, networks,
-              and network devices (specifically including internet access) are
-              provided only for authorized U.S. Government use. U.S. Government
-              computer systems may be monitored for all lawful purposes,
-              including to ensure that their use is authorized, for management
-              of the system, to facilitate protection against unauthorized
-              access, and to verify security procedures, survivability, and
-              operational security. Monitoring includes active attacks by
-              authorized U.S. Government entities to test or verify the security
-              of this system. During monitoring, information may be examined,
-              recorded, copied and used for authorized purposes. All
-              information, including personal information, placed or sent over
-              this system may be monitored.
-            </div>
-            <div className="banner_login">
-              {' '}
-              Unauthorized use may subject you to criminal prosecution. Evidence
-              of unauthorized use collected during monitoring may be used for
-              administrative, criminal, or other adverse action. Use of this
-              system constitutes consent to monitoring for these purposes.
-            </div>
-          </div>
-        </ThemeProvider>
-      </AuthForm>
-    );
-  }
-
-  return (
-    <AuthForm onSubmit={onSubmit}>
-      <h1>Welcome to Crossfeed</h1>
-      {errors.global && <p className="text-error">{errors.global}</p>}
-      <Button type="submit" size="big">
-        Login with Login.gov
-      </Button>
-      <Link to="#" onClick={onSubmit}>
-        New to Crossfeed? Register with Login.gov
-      </Link>
-    </AuthForm>
-  );
-};