diff --git a/settings/src/components/first-time/first-time.js b/settings/src/components/first-time/first-time.js
index 17605841..8d8ba04d 100644
--- a/settings/src/components/first-time/first-time.js
+++ b/settings/src/components/first-time/first-time.js
@@ -139,7 +139,6 @@ export default function FirstTime() {
 				<div className="wporg-2fa__first-time__inner-content">
 					<WordPressLogo />
 					{ currentScreenComponent }
-
 				</div>
 			</div>
 		</div>
diff --git a/settings/src/components/first-time/first-time.scss b/settings/src/components/first-time/first-time.scss
index 26e6f728..e5efd855 100644
--- a/settings/src/components/first-time/first-time.scss
+++ b/settings/src/components/first-time/first-time.scss
@@ -7,7 +7,6 @@
     height: 100%;
     z-index: 1000;
 
-
     .wporg-2fa__first-time__inner {
         padding: 80px 0;
         margin-top: 20px;
@@ -36,6 +35,10 @@
         .components-card {
             width: 100%;
         }
+
+        .components-card__body {
+            padding: 32px;
+        }
     }
 
     .wporg-2fa__first-time-default {
diff --git a/settings/src/components/first-time/home.js b/settings/src/components/first-time/home.js
index 6d99ecff..d7f9d95c 100644
--- a/settings/src/components/first-time/home.js
+++ b/settings/src/components/first-time/home.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
 /**
  * WordPress dependencies
  */
@@ -23,7 +24,7 @@ export default function Select( { onSelect } ) {
 		<>
 			<p>Select a method to configure two-factor authentication for your account.</p>
 			<form className="wporg-2fa__first-time-default">
-				<label htmlFor="totp" className="wporg-2fa__first-time-default-item">
+				<label className="wporg-2fa__first-time-default-item">
 					<input
 						type="radio"
 						id="totp"
@@ -37,7 +38,7 @@ export default function Select( { onSelect } ) {
 						<p>Use an application to get two-factor authentication codes.</p>
 					</div>
 				</label>
-				<label htmlFor="webauthn" className="wporg-2fa__first-time-default-item">
+				<label className="wporg-2fa__first-time-default-item">
 					<input
 						type="radio"
 						id="webauthn"
diff --git a/settings/src/components/screen-navigation.js b/settings/src/components/screen-navigation.js
index 2fc32d88..1ed88af0 100644
--- a/settings/src/components/screen-navigation.js
+++ b/settings/src/components/screen-navigation.js
@@ -14,6 +14,7 @@ import ScreenLink from './screen-link';
  * @param props.children
  * @param props.screen
  * @param props.title
+ * @param props.canNavigate
  */
 // eslint-disable-next-line no-unused-vars
 const ScreenNavigation = ( { screen, children, title = '', canNavigate = true } ) => (
diff --git a/settings/src/components/totp.js b/settings/src/components/totp.js
index f708fc9a..f4830929 100644
--- a/settings/src/components/totp.js
+++ b/settings/src/components/totp.js
@@ -17,8 +17,7 @@ import Success from './success';
 
 export default function TOTP( { onSuccess } ) {
 	const {
-		user: { backupCodesEnabled, totpEnabled },
-		navigateToScreen,
+		user: { totpEnabled },
 	} = useContext( GlobalContext );
 	const [ success, setSuccess ] = useState( false );
 
@@ -26,7 +25,7 @@ export default function TOTP( { onSuccess } ) {
 		setSuccess( false );
 
 		onSuccess();
-	}, [ backupCodesEnabled, navigateToScreen ] );
+	}, [ onSuccess ] );
 
 	if ( success ) {
 		return (
diff --git a/settings/src/components/webauthn/webauthn.js b/settings/src/components/webauthn/webauthn.js
index d6f6f276..cd74fd4f 100644
--- a/settings/src/components/webauthn/webauthn.js
+++ b/settings/src/components/webauthn/webauthn.js
@@ -100,7 +100,7 @@ export default function WebAuthn( { onKeyAdd = () => {} } ) {
 
 		updateFlow( 'manage' );
 		onKeyAdd();
-	}, [ webAuthnEnabled, toggleProvider, updateFlow ] );
+	}, [ webAuthnEnabled, toggleProvider, updateFlow, onKeyAdd ] );
 
 	if ( 'register' === flow ) {
 		return (
diff --git a/settings/src/script.js b/settings/src/script.js
index fd933276..5d15a4c3 100644
--- a/settings/src/script.js
+++ b/settings/src/script.js
@@ -17,7 +17,7 @@ import { Spinner } from '@wordpress/components';
 import { useUser } from './hooks/useUser';
 import GlobalNotice from './components/global-notice';
 import RevalidateModal from './components/revalidate-modal';
-//import Settings from './components/settings';
+import Settings from './components/settings';
 import FirstTime from './components/first-time/first-time';
 
 export const GlobalContext = createContext( null );
@@ -144,7 +144,12 @@ function Main( { userId } ) {
 			} }
 		>
 			<GlobalNotice notice={ globalNotice } setNotice={ setGlobalNotice } />
-			<FirstTime />
+
+			{ new URLSearchParams( window.location.search ).get( 'first-time' ) ? (
+				<FirstTime />
+			) : (
+				<Settings />
+			) }
 			{ shouldRevalidate && <RevalidateModal /> }
 		</GlobalContext.Provider>
 	);