diff --git a/src/components/AccountList.tsx b/src/components/AccountList.tsx
index 5132efe22c..e33fb981fd 100644
--- a/src/components/AccountList.tsx
+++ b/src/components/AccountList.tsx
@@ -182,7 +182,11 @@ function AccountItem({
           {isCurrentAccount ? (
             <View
               style={[
-                {width: 20, height: 20, backgroundColor: t.palette.primary_500},
+                {
+                  width: 20,
+                  height: 20,
+                  backgroundColor: t.palette.positive_600,
+                },
                 a.rounded_full,
                 a.justify_center,
                 a.align_center,
diff --git a/src/screens/Authentication/ForgotPasswordScreen.tsx b/src/screens/Authentication/ForgotPasswordScreen.tsx
index 64a86f5a95..118fa6b885 100644
--- a/src/screens/Authentication/ForgotPasswordScreen.tsx
+++ b/src/screens/Authentication/ForgotPasswordScreen.tsx
@@ -3,6 +3,7 @@ import {
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import * as Layout from './components/Layout'
 
@@ -21,7 +22,7 @@ export function ForgotPasswordScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
+      <Layout.Content contentContainerStyle={[a.px_2xl, a.py_lg]}>
         <Text>TODO</Text>
       </Layout.Content>
     </Layout.Screen>
diff --git a/src/screens/Authentication/PasswordUpdatedScreen.tsx b/src/screens/Authentication/PasswordUpdatedScreen.tsx
index 631d6642a0..fcfad9b896 100644
--- a/src/screens/Authentication/PasswordUpdatedScreen.tsx
+++ b/src/screens/Authentication/PasswordUpdatedScreen.tsx
@@ -3,6 +3,7 @@ import {
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import * as Layout from './components/Layout'
 
@@ -21,7 +22,7 @@ export function PasswordUpdatedScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
+      <Layout.Content contentContainerStyle={[a.px_2xl, a.py_lg]}>
         <Text>TODO</Text>
       </Layout.Content>
     </Layout.Screen>
diff --git a/src/screens/Authentication/SetNewPasswordScreen.tsx b/src/screens/Authentication/SetNewPasswordScreen.tsx
index dd441ca849..03c1cdde9c 100644
--- a/src/screens/Authentication/SetNewPasswordScreen.tsx
+++ b/src/screens/Authentication/SetNewPasswordScreen.tsx
@@ -3,6 +3,7 @@ import {
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import * as Layout from './components/Layout'
 
@@ -21,7 +22,7 @@ export function SetNewPasswordScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
+      <Layout.Content contentContainerStyle={[a.px_2xl, a.py_lg]}>
         <Text>TODO</Text>
       </Layout.Content>
     </Layout.Screen>
diff --git a/src/screens/Authentication/SignInScreen.tsx b/src/screens/Authentication/SignInScreen.tsx
index 8b258a0e17..709719b037 100644
--- a/src/screens/Authentication/SignInScreen.tsx
+++ b/src/screens/Authentication/SignInScreen.tsx
@@ -1,8 +1,10 @@
 import {useEffect, useRef, useState} from 'react'
+import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {DEFAULT_SERVICE} from '#/lib/constants'
+import {useEnableKeyboardControllerScreen} from '#/lib/hooks/useEnableKeyboardController'
 import {
   type AuthNavigatorParams,
   type NativeStackScreenProps,
@@ -87,6 +89,8 @@ export function SignInScreenInner({
     failedAttemptCountRef.current += 1
   }
 
+  useEnableKeyboardControllerScreen(true)
+
   return (
     <Layout.Screen testID="SignInScreen">
       <Layout.Header.Outer noBottomBorder>
@@ -96,34 +100,38 @@ export function SignInScreenInner({
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content contentContainerStyle={[a.p_xl]}>
-        <Layout.TitleText>
-          <Trans>Log in</Trans>
-        </Layout.TitleText>
-        <SignInForm
-          error={error}
-          serviceUrl={serviceUrl}
-          serviceDescription={serviceDescription}
-          initialHandle={requestedAccount?.handle}
-          setError={setError}
-          onAttemptFailed={onAttemptFailed}
-          onAttemptSuccess={onAttemptSuccess}
-          setServiceUrl={setServiceUrl}
-          onPressForgotPassword={onPressForgotPassword}
-          onPressRetryConnect={refetchService}
-        />
-        <Text style={[a.text_md, a.text_center, a.w_full, a.mt_2xl]}>
-          <Trans>
-            New to Bluesky?{' '}
-            <Text
-              role="link"
-              onPress={signUp}
-              style={[a.text_md, {color: t.palette.primary_500}]}>
-              Create account
-            </Text>
-          </Trans>
-        </Text>
-      </Layout.Content>
+      <KeyboardAvoidingView style={[a.flex_1]} behavior="padding">
+        <Layout.Content
+          style={[a.flex_1]}
+          contentContainerStyle={[a.px_2xl, a.py_lg]}>
+          <Layout.TitleText>
+            <Trans>Log in</Trans>
+          </Layout.TitleText>
+          <SignInForm
+            error={error}
+            serviceUrl={serviceUrl}
+            serviceDescription={serviceDescription}
+            initialHandle={requestedAccount?.handle}
+            setError={setError}
+            onAttemptFailed={onAttemptFailed}
+            onAttemptSuccess={onAttemptSuccess}
+            setServiceUrl={setServiceUrl}
+            onPressForgotPassword={onPressForgotPassword}
+            onPressRetryConnect={refetchService}
+          />
+          <Text style={[a.text_md, a.text_center, a.w_full, a.mt_2xl]}>
+            <Trans>
+              New to Bluesky?{' '}
+              <Text
+                role="link"
+                onPress={signUp}
+                style={[a.text_md, {color: t.palette.primary_500}]}>
+                Create account
+              </Text>
+            </Trans>
+          </Text>
+        </Layout.Content>
+      </KeyboardAvoidingView>
     </Layout.Screen>
   )
 }
diff --git a/src/screens/Authentication/SignUpCaptchaScreen.tsx b/src/screens/Authentication/SignUpCaptchaScreen.tsx
index c912fda71b..951411d1ba 100644
--- a/src/screens/Authentication/SignUpCaptchaScreen.tsx
+++ b/src/screens/Authentication/SignUpCaptchaScreen.tsx
@@ -3,6 +3,7 @@ import {
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import * as Layout from './components/Layout'
 
@@ -21,7 +22,7 @@ export function SignUpCaptchaScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
+      <Layout.Content contentContainerStyle={[a.px_2xl, a.py_lg]}>
         <Text>TODO</Text>
       </Layout.Content>
     </Layout.Screen>
diff --git a/src/screens/Authentication/SignUpHandleScreen.tsx b/src/screens/Authentication/SignUpHandleScreen.tsx
index 54fb01b586..1424987428 100644
--- a/src/screens/Authentication/SignUpHandleScreen.tsx
+++ b/src/screens/Authentication/SignUpHandleScreen.tsx
@@ -3,6 +3,7 @@ import {
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
+import {atoms as a} from '#/alf'
 import {Text} from '#/components/Typography'
 import * as Layout from './components/Layout'
 
@@ -21,7 +22,7 @@ export function SignUpHandleScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
+      <Layout.Content contentContainerStyle={[a.px_2xl, a.py_lg]}>
         <Text>TODO</Text>
       </Layout.Content>
     </Layout.Screen>
diff --git a/src/screens/Authentication/SignUpInfoScreen.tsx b/src/screens/Authentication/SignUpInfoScreen.tsx
index fc404b94f8..5b78cb805e 100644
--- a/src/screens/Authentication/SignUpInfoScreen.tsx
+++ b/src/screens/Authentication/SignUpInfoScreen.tsx
@@ -1,9 +1,21 @@
+import {useState} from 'react'
+import {View} from 'react-native'
+import {KeyboardAvoidingView} from 'react-native-keyboard-controller'
+import {useSafeAreaInsets} from 'react-native-safe-area-context'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {useEnableKeyboardControllerScreen} from '#/lib/hooks/useEnableKeyboardController'
 import {
   type AuthNavigatorParams,
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {Logo} from '#/view/icons/Logo'
-import {Text} from '#/components/Typography'
+import {atoms as a, native, platform, tokens} from '#/alf'
+import {Button, ButtonText} from '#/components/Button'
+import * as TextField from '#/components/forms/TextField'
+import {Envelope_Stroke2_Corner0_Rounded as EnvelopeIcon} from '#/components/icons/Envelope'
+import {Policies} from '../Signup/StepInfo/Policies'
 import * as Layout from './components/Layout'
 
 type Props = NativeStackScreenProps<AuthNavigatorParams, 'SignUpInfo'>
@@ -12,6 +24,13 @@ export function SignUpInfoScreen({}: Props) {
 }
 
 export function SignUpInfoScreenInner() {
+  const {_} = useLingui()
+  const [email, setEmail] = useState('')
+
+  const {bottom} = useSafeAreaInsets()
+
+  useEnableKeyboardControllerScreen(true)
+
   return (
     <Layout.Screen testID="SignUpInfoScreen">
       <Layout.Header.Outer noBottomBorder>
@@ -21,9 +40,104 @@ export function SignUpInfoScreenInner() {
         </Layout.Header.Content>
         <Layout.Header.Slot />
       </Layout.Header.Outer>
-      <Layout.Content>
-        <Text>TODO</Text>
-      </Layout.Content>
+      <KeyboardAvoidingView
+        style={[a.flex_1]}
+        behavior="padding"
+        keyboardVerticalOffset={Math.min(
+          0,
+          tokens.space._2xl -
+            (bottom +
+              platform({
+                ios: tokens.space.xs,
+                android: tokens.space.sm,
+                default: 0,
+              })),
+        )}>
+        <Layout.Content
+          style={[a.flex_1]}
+          contentContainerStyle={[a.px_2xl, a.py_lg]}>
+          <Layout.TitleText>
+            <Trans>Email</Trans>
+          </Layout.TitleText>
+          <View style={[a.mt_lg]}>
+            <TextField.Root>
+              <TextField.Icon icon={EnvelopeIcon} />
+              <TextField.Input
+                testID="emailInput"
+                value={email}
+                onChangeText={value => {
+                  // emailValueRef.current = value.trim()
+                  // if (hasWarnedEmail) {
+                  //   setHasWarnedEmail(false)
+                  // }
+                  // if (
+                  //   state.errorField === 'email' &&
+                  //   value.trim().length > 0 &&
+                  //   EmailValidator.validate(value.trim())
+                  // ) {
+                  //   dispatch({type: 'clearError'})
+                  // }
+                  setEmail(value)
+                }}
+                label={_(msg`name@email.com`)}
+                autoFocus
+                autoCapitalize="none"
+                autoComplete="email"
+                keyboardType="email-address"
+                returnKeyType="next"
+                submitBehavior={native('submit')}
+                onSubmitEditing={
+                  // TODO
+                  () => console.log('submit')
+                }
+              />
+            </TextField.Root>
+          </View>
+        </Layout.Content>
+        <View
+          style={[
+            a.px_2xl,
+            {
+              paddingBottom: Math.max(
+                tokens.space._2xl,
+                bottom +
+                  platform({
+                    ios: tokens.space.xs,
+                    android: tokens.space.sm,
+                    default: 0,
+                  }),
+              ),
+            },
+            a.gap_md,
+          ]}>
+          <Policies
+            serviceDescription={{
+              availableUserDomains: ['bsky.social'],
+              did: 'did:plc:example',
+              links: {
+                privacyPolicy: 'https://example.com/pp',
+                termsOfService: 'https://example.com/terms',
+              },
+            }}
+            needsGuardian={true}
+            under13={false}
+            // needsGuardian={!is18(state.dateOfBirth)}
+            // under13={!is13(state.dateOfBirth)}
+          />
+          <Button
+            testID="emailNextButton"
+            label={_(msg`Continue`)}
+            accessibilityHint={_(msg`Go to the next step`)}
+            variant="solid"
+            color="primary"
+            size="large">
+            <ButtonText>
+              <Trans>Continue</Trans>
+            </ButtonText>
+            {/* {isProcessing && <ButtonIcon icon={Loader} />} */}
+          </Button>
+        </View>
+      </KeyboardAvoidingView>
     </Layout.Screen>
   )
 }
diff --git a/src/screens/Authentication/components/SignInForm.tsx b/src/screens/Authentication/components/SignInForm.tsx
index 31b69bb513..4bf0c8e3d3 100644
--- a/src/screens/Authentication/components/SignInForm.tsx
+++ b/src/screens/Authentication/components/SignInForm.tsx
@@ -172,7 +172,7 @@ export function SignInForm({
   }
 
   return (
-    <View style={[a.pt_2xl, a.gap_md]}>
+    <View style={[a.pt_2xl, a.gap_lg]}>
       <View>
         <TextField.LabelText>
           <Trans>Username or email address</Trans>
@@ -245,7 +245,7 @@ export function SignInForm({
           accessibilityHint={_(msg`Opens password reset form`)}
           variant="ghost"
           color="secondary">
-          <ButtonText>
+          <ButtonText style={[a.font_normal]}>
             <Trans>Forgot password?</Trans>
           </ButtonText>
         </Button>