diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c
index e5ef76bbd44..f15c282383a 100644
--- a/base/setup/lib/setuplib.c
+++ b/base/setup/lib/setuplib.c
@@ -1336,22 +1336,19 @@ DoUpdate:
             goto Cleanup;
         }
 
-        if (!IsUnattendedSetup)
-        {
-            Entry = GetCurrentListEntry(pSetupData->LayoutList);
-            ASSERT(Entry);
-            pSetupData->LayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id;
-            ASSERT(pSetupData->LayoutId);
+        Entry = GetCurrentListEntry(pSetupData->LayoutList);
+        ASSERT(Entry);
+        pSetupData->LayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id;
+        ASSERT(pSetupData->LayoutId);
 
-            /* Update keyboard layout settings with user-overridden values */
-            // FIXME: Wouldn't it be better to do it all at once
-            // with the AddKeyboardLayouts() step?
-            if (StatusRoutine) StatusRoutine(KeybSettingsUpdate);
-            if (!ProcessKeyboardLayoutRegistry(pSetupData->LayoutId, SelectedLanguageId))
-            {
-                ErrorNumber = ERROR_UPDATE_KBSETTINGS;
-                goto Cleanup;
-            }
+        /* Update keyboard layout settings with user-overridden values */
+        // FIXME: Wouldn't it be better to do it all at once
+        // with the AddKeyboardLayouts() step?
+        if (StatusRoutine) StatusRoutine(KeybSettingsUpdate);
+        if (!ProcessKeyboardLayoutRegistry(pSetupData->LayoutId, SelectedLanguageId))
+        {
+            ErrorNumber = ERROR_UPDATE_KBSETTINGS;
+            goto Cleanup;
         }
 
         /* Set GeoID */