diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 867d77c..d553168 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -821,8 +821,9 @@ function install_get_form($form_id, array &$install_state) {
     // For non-interactive installs, submit the form programmatically with the
     // values taken from the installation state.
     $form_state['values'] = array();
-    if (!empty($install_state['forms'][$form_id])) {
-      $form_state['values'] = $install_state['forms'][$form_id];
+    $install_form_id = $form_builder->getFormId($form_id, $form_state);
+    if (!empty($install_state['forms'][$install_form_id])) {
+      $form_state['values'] = $install_state['forms'][$install_form_id];
     }
     $form_builder->submitForm($form_id, $form_state);