diff --git a/core/includes/form.inc b/core/includes/form.inc
index 7b27840..efbbd8e 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -129,7 +129,7 @@ function drupal_get_form($form_id) {
   $args = func_get_args();
   // Remove $form_id from the arguments.
   unset($args[0]);
-  $form_state['build_info']['args'] = $args;
+  $form_state['build_info']['args'] = array_values($args);
 
   return drupal_build_form($form_id, $form_state);
 }
@@ -684,7 +684,7 @@ function drupal_form_submit($form_id, &$form_state) {
     $args = func_get_args();
     // Remove $form_id and $form_state from the arguments.
     unset($args[0], $args[1]);
-    $form_state['build_info']['args'] = $args;
+    $form_state['build_info']['args'] = array_values($args);
   }
   // Merge in default values.
   $form_state += form_state_defaults();
diff --git a/core/modules/openid/openid.pages.inc b/core/modules/openid/openid.pages.inc
index 5652af2..885fe1d 100644
--- a/core/modules/openid/openid.pages.inc
+++ b/core/modules/openid/openid.pages.inc
@@ -105,14 +105,13 @@ function openid_user_delete_form($form, $form_state, $account, $aid = 0) {
 }
 
 function openid_user_delete_form_submit($form, &$form_state) {
-  $args = array_values($form_state['build_info']['args']);
   $query = db_delete('authmap')
-    ->condition('uid', $args[0]->uid)
-    ->condition('aid', $args[1])
+    ->condition('uid', $form_state['build_info']['args'][0]->uid)
+    ->condition('aid', $form_state['build_info']['args'][1])
     ->condition('module', 'openid')
     ->execute();
   if ($query) {
     drupal_set_message(t('OpenID deleted.'));
   }
-  $form_state['redirect'] = 'user/' . $args[0]->uid . '/openid';
+  $form_state['redirect'] = 'user/' . $form_state['build_info']['args'][0]->uid . '/openid';
 }