diff --git a/src/components/forms/HostingProvider.tsx b/src/components/forms/HostingProvider.tsx
index 110090017..72164bd09 100644
--- a/src/components/forms/HostingProvider.tsx
+++ b/src/components/forms/HostingProvider.tsx
@@ -18,7 +18,7 @@ export function HostingProvider({
   onOpenDialog,
   minimal,
 }: {
-  serviceUrl: string
+  serviceUrl?: string | undefined
   onSelectServiceUrl: (provider: string) => void
   onOpenDialog?: () => void
   minimal?: boolean
@@ -26,6 +26,8 @@ export function HostingProvider({
   const serverInputControl = useDialogControl()
   const t = useTheme()
   const {_} = useLingui()
+  const serviceProviderLabel =
+    serviceUrl === undefined ? _(msg`Automatic`) : toNiceDomain(serviceUrl)
 
   const onPressSelectService = React.useCallback(() => {
     Keyboard.dismiss()
@@ -45,7 +47,7 @@ export function HostingProvider({
             <Trans>You are creating an account on</Trans>
           </Text>
           <Button
-            label={toNiceDomain(serviceUrl)}
+            label={serviceProviderLabel}
             accessibilityHint={_(msg`Changes hosting provider`)}
             onPress={onPressSelectService}
             variant="ghost"
@@ -56,16 +58,14 @@ export function HostingProvider({
               {marginHorizontal: tokens.space.xs * -1},
               {paddingVertical: 0},
             ]}>
-            <ButtonText style={[a.text_sm]}>
-              {toNiceDomain(serviceUrl)}
-            </ButtonText>
+            <ButtonText style={[a.text_sm]}>{serviceProviderLabel}</ButtonText>
             <ButtonIcon icon={PencilIcon} />
           </Button>
         </View>
       ) : (
         <Button
           testID="selectServiceButton"
-          label={toNiceDomain(serviceUrl)}
+          label={serviceProviderLabel}
           accessibilityHint={_(msg`Changes hosting provider`)}
           variant="solid"
           color="secondary"
@@ -94,7 +94,7 @@ export function HostingProvider({
                     }
                   />
                 </View>
-                <Text style={[a.text_md]}>{toNiceDomain(serviceUrl)}</Text>
+                <Text style={[a.text_md]}>{serviceProviderLabel}</Text>
                 <View
                   style={[
                     a.rounded_sm,
diff --git a/src/screens/Login/LoginForm.tsx b/src/screens/Login/LoginForm.tsx
index b6a528e42..b5a9dc4ae 100644
--- a/src/screens/Login/LoginForm.tsx
+++ b/src/screens/Login/LoginForm.tsx
@@ -47,9 +47,11 @@ export const LoginForm = ({
   onPressForgotPassword,
   onAttemptSuccess,
   onAttemptFailed,
+  debouncedResolveService,
+  isResolvingService,
 }: {
   error: string
-  serviceUrl: string
+  serviceUrl?: string | undefined
   serviceDescription: ServiceDescription | undefined
   initialHandle: string
   setError: (v: string) => void
@@ -59,6 +61,8 @@ export const LoginForm = ({
   onPressForgotPassword: () => void
   onAttemptSuccess: () => void
   onAttemptFailed: () => void
+  debouncedResolveService: (identifier: string) => void
+  isResolvingService: boolean
 }) => {
   const t = useTheme()
   const [isProcessing, setIsProcessing] = useState<boolean>(false)
@@ -100,6 +104,11 @@ export const LoginForm = ({
       return
     }
 
+    if (!serviceUrl) {
+      setError(_(msg`Please enter hosting provider URL`))
+      return
+    }
+
     setIsProcessing(true)
 
     try {
@@ -182,6 +191,13 @@ export const LoginForm = ({
       <View>
         <TextField.LabelText>
           <Trans>Hosting provider</Trans>
+          {isResolvingService && (
+            <ActivityIndicator
+              size={12}
+              color={t.palette.contrast_500}
+              style={a.ml_sm}
+            />
+          )}
         </TextField.LabelText>
         <HostingProvider
           serviceUrl={serviceUrl}
@@ -208,6 +224,15 @@ export const LoginForm = ({
               defaultValue={initialHandle || ''}
               onChangeText={v => {
                 identifierValueRef.current = v
+                // Trigger PDS auto-resolution for handles/DIDs
+                const id = v.trim()
+                if (!id) return
+                if (
+                  id.startsWith('did:') ||
+                  (id.includes('.') && !id.includes('@'))
+                ) {
+                  debouncedResolveService(id)
+                }
               }}
               onSubmitEditing={() => {
                 passwordRef.current?.focus()
@@ -330,9 +355,9 @@ export const LoginForm = ({
               <Trans>Retry</Trans>
             </ButtonText>
           </Button>
-        ) : !serviceDescription ? (
+        ) : !serviceDescription && serviceUrl !== undefined ? (
           <>
-            <ActivityIndicator />
+            <ActivityIndicator color={t.palette.contrast_500} />
             <Text style={[t.atoms.text_contrast_high, a.pl_md]}>
               <Trans>Connecting...</Trans>
             </Text>
diff --git a/src/screens/Login/index.tsx b/src/screens/Login/index.tsx
index 601d76606..4a48d489e 100644
--- a/src/screens/Login/index.tsx
+++ b/src/screens/Login/index.tsx
@@ -1,14 +1,16 @@
-import React, {useRef} from 'react'
+import React, {useCallback, useMemo, useRef} from 'react'
 import {KeyboardAvoidingView} from 'react-native'
 import {LayoutAnimationConfig} from 'react-native-reanimated'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
+import debounce from 'lodash.debounce'
 
 import {DEFAULT_SERVICE} from '#/lib/constants'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
+import {resolvePdsServiceUrl} from '#/state/queries/resolve-identity'
 import {useServiceQuery} from '#/state/queries/service'
-import {type SessionAccount, useSession} from '#/state/session'
+import {type SessionAccount, useAgent, useSession} from '#/state/session'
 import {useLoggedOutView} from '#/state/shell/logged-out'
 import {LoggedOutLayout} from '#/view/com/util/layouts/LoggedOutLayout'
 import {ForgotPasswordForm} from '#/screens/Login/ForgotPasswordForm'
@@ -32,15 +34,17 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
   const failedAttemptCountRef = useRef(0)
   const startTimeRef = useRef(Date.now())
 
+  const agent = useAgent()
   const {accounts} = useSession()
   const {requestedAccountSwitchTo} = useLoggedOutView()
   const requestedAccount = accounts.find(
     acc => acc.did === requestedAccountSwitchTo,
   )
 
+  const [isResolvingService, setIsResolvingService] = React.useState(false)
   const [error, setError] = React.useState<string>('')
-  const [serviceUrl, setServiceUrl] = React.useState<string>(
-    requestedAccount?.service || DEFAULT_SERVICE,
+  const [serviceUrl, setServiceUrl] = React.useState<string | undefined>(
+    requestedAccount?.service,
   )
   const [initialHandle, setInitialHandle] = React.useState<string>(
     requestedAccount?.handle || '',
@@ -57,7 +61,7 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
     data: serviceDescription,
     error: serviceError,
     refetch: refetchService,
-  } = useServiceQuery(serviceUrl)
+  } = useServiceQuery(serviceUrl ?? '')
 
   const onSelectAccount = (account?: SessionAccount) => {
     if (account?.service) {
@@ -88,6 +92,43 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
     }
   }, [serviceError, serviceUrl, _])
 
+  const resolveIdentity = useCallback(
+    async (identifier: string) => {
+      setIsResolvingService(true)
+
+      try {
+        const getDid = async () => {
+          if (identifier.startsWith('did:')) return identifier
+          else
+            return (
+              await agent.resolveHandle({
+                handle: identifier,
+              })
+            ).data.did
+        }
+
+        const did = (await getDid()) as `did:${string}`
+        const pdsUrl = await resolvePdsServiceUrl(did)
+
+        if (pdsUrl.endsWith('.bsky.network')) {
+          setServiceUrl('https://bsky.social')
+        } else {
+          setServiceUrl(pdsUrl)
+        }
+      } catch (err) {
+        logger.error(`Service auto-resolution failed: ${err}`)
+      } finally {
+        setIsResolvingService(false)
+      }
+    },
+    [agent],
+  )
+
+  const debouncedResolveService = useMemo(
+    () => debounce(resolveIdentity, 800),
+    [resolveIdentity],
+  )
+
   const onPressForgotPassword = () => {
     setCurrentForm(Forms.ForgotPassword)
     logEvent('signin:forgotPasswordPressed', {})
@@ -136,6 +177,8 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
           }
           onPressForgotPassword={onPressForgotPassword}
           onPressRetryConnect={refetchService}
+          debouncedResolveService={debouncedResolveService}
+          isResolvingService={isResolvingService}
         />
       )
       break
@@ -155,7 +198,7 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
       content = (
         <ForgotPasswordForm
           error={error}
-          serviceUrl={serviceUrl}
+          serviceUrl={serviceUrl ?? DEFAULT_SERVICE}
           serviceDescription={serviceDescription}
           setError={setError}
           setServiceUrl={setServiceUrl}
@@ -170,7 +213,7 @@ export const Login = ({onPressBack}: {onPressBack: () => void}) => {
       content = (
         <SetNewPasswordForm
           error={error}
-          serviceUrl={serviceUrl}
+          serviceUrl={serviceUrl ?? DEFAULT_SERVICE}
           setError={setError}
           onPressBack={() => gotoForm(Forms.ForgotPassword)}
           onPasswordSet={() => gotoForm(Forms.PasswordUpdated)}
diff --git a/src/view/com/auth/server-input/index.tsx b/src/view/com/auth/server-input/index.tsx
index 9fd426a9b..568ef3aa5 100644
--- a/src/view/com/auth/server-input/index.tsx
+++ b/src/view/com/auth/server-input/index.tsx
@@ -13,7 +13,6 @@ import {Admonition} from '#/components/Admonition'
 import {Button, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import * as TextField from '#/components/forms/TextField'
-import * as ToggleButton from '#/components/forms/ToggleButton'
 import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
 import {InlineLinkText} from '#/components/Link'
 import {P, Text} from '#/components/Typography'
@@ -29,7 +28,6 @@ export function ServerInputDialog({
   const formRef = useRef<DialogInnerRef>(null)
 
   // persist these options between dialog open/close
-  const [fixedOption, setFixedOption] = useState(BSKY_SERVICE)
   const [previousCustomAddress, setPreviousCustomAddress] = useState('')
 
   const onClose = useCallback(() => {
@@ -41,9 +39,9 @@ export function ServerInputDialog({
       }
     }
     logEvent('signin:hostingProviderPressed', {
-      hostingProviderDidChange: fixedOption !== BSKY_SERVICE,
+      hostingProviderDidChange: false, // stubbed for PDS auto-resolution
     })
-  }, [onSelect, fixedOption])
+  }, [onSelect])
 
   return (
     <Dialog.Outer
@@ -53,8 +51,6 @@ export function ServerInputDialog({
       <Dialog.Handle />
       <DialogInner
         formRef={formRef}
-        fixedOption={fixedOption}
-        setFixedOption={setFixedOption}
         initialCustomAddress={previousCustomAddress}
       />
     </Dialog.Outer>
@@ -65,13 +61,9 @@ type DialogInnerRef = {getFormState: () => string | null}
 
 function DialogInner({
   formRef,
-  fixedOption,
-  setFixedOption,
   initialCustomAddress,
 }: {
   formRef: React.Ref<DialogInnerRef>
-  fixedOption: string
-  setFixedOption: (opt: string) => void
   initialCustomAddress: string
 }) {
   const control = Dialog.useDialogContext()
@@ -88,14 +80,9 @@ function DialogInner({
     formRef,
     () => ({
       getFormState: () => {
-        let url
-        if (fixedOption === 'custom') {
-          url = customAddress.trim().toLowerCase()
-          if (!url) {
-            return null
-          }
-        } else {
-          url = fixedOption
+        let url = customAddress.trim().toLowerCase()
+        if (!url) {
+          return null
         }
         if (!url.startsWith('http://') && !url.startsWith('https://')) {
           if (url === 'localhost' || url.startsWith('localhost:')) {
@@ -105,18 +92,16 @@ function DialogInner({
           }
         }
 
-        if (fixedOption === 'custom') {
-          if (!pdsAddressHistory.includes(url)) {
-            const newHistory = [url, ...pdsAddressHistory.slice(0, 4)]
-            setPdsAddressHistory(newHistory)
-            persisted.write('pdsAddressHistory', newHistory)
-          }
+        if (!pdsAddressHistory.includes(url)) {
+          const newHistory = [url, ...pdsAddressHistory.slice(0, 4)]
+          setPdsAddressHistory(newHistory)
+          persisted.write('pdsAddressHistory', newHistory)
         }
 
         return url
       },
     }),
-    [customAddress, fixedOption, pdsAddressHistory],
+    [customAddress, pdsAddressHistory],
   )
 
   const isFirstTimeUser = accounts.length === 0
@@ -129,22 +114,8 @@ function DialogInner({
         <Text nativeID="dialog-title" style={[a.text_2xl, a.font_bold]}>
           <Trans>Choose your account provider</Trans>
         </Text>
-        <ToggleButton.Group
-          label="Preferences"
-          values={[fixedOption]}
-          onChange={values => setFixedOption(values[0])}>
-          <ToggleButton.Button name={BSKY_SERVICE} label={_(msg`Bluesky`)}>
-            <ToggleButton.ButtonText>{_(msg`Bluesky`)}</ToggleButton.ButtonText>
-          </ToggleButton.Button>
-          <ToggleButton.Button
-            testID="customSelectBtn"
-            name="custom"
-            label={_(msg`Custom`)}>
-            <ToggleButton.ButtonText>{_(msg`Custom`)}</ToggleButton.ButtonText>
-          </ToggleButton.Button>
-        </ToggleButton.Group>
-
-        {fixedOption === BSKY_SERVICE && isFirstTimeUser && (
+
+        {isFirstTimeUser && (
           <Admonition type="tip">
             <Trans>
               Bluesky is an open network where you can choose your own provider.
@@ -154,47 +125,45 @@ function DialogInner({
           </Admonition>
         )}
 
-        {fixedOption === 'custom' && (
-          <View
-            style={[
-              a.border,
-              t.atoms.border_contrast_low,
-              a.rounded_sm,
-              a.px_md,
-              a.py_md,
-            ]}>
-            <TextField.LabelText nativeID="address-input-label">
-              <Trans>Server address</Trans>
-            </TextField.LabelText>
-            <TextField.Root>
-              <TextField.Icon icon={Globe} />
-              <Dialog.Input
-                testID="customServerTextInput"
-                value={customAddress}
-                onChangeText={setCustomAddress}
-                label="my-server.com"
-                accessibilityLabelledBy="address-input-label"
-                autoCapitalize="none"
-                keyboardType="url"
-              />
-            </TextField.Root>
-            {pdsAddressHistory.length > 0 && (
-              <View style={[a.flex_row, a.flex_wrap, a.mt_xs]}>
-                {pdsAddressHistory.map(uri => (
-                  <Button
-                    key={uri}
-                    variant="ghost"
-                    color="primary"
-                    label={uri}
-                    style={[a.px_sm, a.py_xs, a.rounded_sm, a.gap_sm]}
-                    onPress={() => setCustomAddress(uri)}>
-                    <ButtonText>{uri}</ButtonText>
-                  </Button>
-                ))}
-              </View>
-            )}
-          </View>
-        )}
+        <View
+          style={[
+            a.border,
+            t.atoms.border_contrast_low,
+            a.rounded_sm,
+            a.px_md,
+            a.py_md,
+          ]}>
+          <TextField.LabelText nativeID="address-input-label">
+            <Trans>Server address</Trans>
+          </TextField.LabelText>
+          <TextField.Root>
+            <TextField.Icon icon={Globe} />
+            <Dialog.Input
+              testID="customServerTextInput"
+              value={customAddress}
+              onChangeText={setCustomAddress}
+              label="my-server.com"
+              accessibilityLabelledBy="address-input-label"
+              autoCapitalize="none"
+              keyboardType="url"
+            />
+          </TextField.Root>
+          {pdsAddressHistory.length > 0 && (
+            <View style={[a.flex_row, a.flex_wrap, a.mt_xs]}>
+              {pdsAddressHistory.map(uri => (
+                <Button
+                  key={uri}
+                  variant="ghost"
+                  color="primary"
+                  label={uri}
+                  style={[a.px_sm, a.py_xs, a.rounded_sm, a.gap_sm]}
+                  onPress={() => setCustomAddress(uri)}>
+                  <ButtonText>{uri}</ButtonText>
+                </Button>
+              ))}
+            </View>
+          )}
+        </View>
 
         <View style={[a.py_xs]}>
           <P