diff --git a/src/MauiSherpa.Core/Services/AppleDownloadAuthService.cs b/src/MauiSherpa.Core/Services/AppleDownloadAuthService.cs
index 1e3b67f..cbe197b 100644
--- a/src/MauiSherpa.Core/Services/AppleDownloadAuthService.cs
+++ b/src/MauiSherpa.Core/Services/AppleDownloadAuthService.cs
@@ -284,11 +284,15 @@ public async Task<bool> RequestSmsCodeAsync(TwoFactorMethod phone)
 
         try
         {
-            var serviceKey = await GetServiceKeyAsync();
+            var serviceKey = _pendingServiceKey ?? await GetServiceKeyAsync();
             if (serviceKey == null) return false;
 
             var request = new HttpRequestMessage(HttpMethod.Put, $"{AuthUrl}/verify/phone");
             request.Headers.Add("X-Apple-Widget-Key", serviceKey);
+            if (_pendingSessionId != null)
+                request.Headers.Add("X-Apple-ID-Session-Id", _pendingSessionId);
+            if (_pendingScnt != null)
+                request.Headers.Add("scnt", _pendingScnt);
             request.Content = new StringContent(
                 JsonSerializer.Serialize(new
                 {
@@ -298,6 +302,7 @@ public async Task<bool> RequestSmsCodeAsync(TwoFactorMethod phone)
                 Encoding.UTF8, "application/json");
 
             var response = await _httpClient.SendAsync(request);
+            _logger.LogInformation($"SMS code request response: {(int)response.StatusCode} {response.StatusCode}");
             return response.IsSuccessStatusCode;
         }
         catch (Exception ex)
diff --git a/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthModal.razor b/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthModal.razor
index 5fd954f..0ffcea8 100644
--- a/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthModal.razor
+++ b/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthModal.razor
@@ -4,6 +4,7 @@
 @using MauiSherpa.Pages.Forms
 @inject HybridFormBridgeHolder BridgeHolder
 @inject XcodeManagementViewModel ViewModel
+@inject IAppleDownloadAuthService AuthService
 @implements IDisposable
 
 @{
@@ -68,11 +69,11 @@
                         }
                     </p>
 
-                    @if (twoFactorOptions?.TrustedPhoneNumbers.Count > 1)
+                    @if (twoFactorOptions?.TrustedPhoneNumbers.Count > 0)
                     {
                         <div class="form-group">
                             <label>Verification method</label>
-                            <select @bind="selectedPhoneIndex" @bind:after="OnFieldChanged" disabled="@isAuthenticating">
+                            <select @bind="selectedPhoneIndex" @bind:after="OnPhoneSelectionChanged" disabled="@isAuthenticating">
                                 @if (twoFactorOptions.CanUseTrustedDevice)
                                 {
                                     <option value="-1">Trusted Device</option>
@@ -149,6 +150,21 @@
 
     private void OnFieldChanged() => UpdateWizardState();
 
+    private async Task OnPhoneSelectionChanged()
+    {
+        UpdateWizardState();
+        await RequestSmsForSelectedPhone();
+    }
+
+    private async Task RequestSmsForSelectedPhone()
+    {
+        if (selectedPhoneIndex >= 0 && twoFactorOptions?.TrustedPhoneNumbers.Count > selectedPhoneIndex)
+        {
+            var phone = twoFactorOptions.TrustedPhoneNumbers[selectedPhoneIndex];
+            await AuthService.RequestSmsCodeAsync(phone);
+        }
+    }
+
     private void UpdateWizardState()
     {
         var bridge = BridgeHolder.Current;
@@ -211,6 +227,10 @@
                         && twoFactorOptions.TrustedPhoneNumbers.Count > 0
                         ? 0
                         : -1;
+
+                    // If SMS was auto-selected, request the code be sent
+                    if (selectedPhoneIndex >= 0)
+                        await RequestSmsForSelectedPhone();
                 }
                 else
                 {