diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc
index 31c099e..c29365f 100644
--- a/core/includes/ajax.inc
+++ b/core/includes/ajax.inc
@@ -337,6 +337,7 @@ function ajax_get_form() {
   // @see drupal_rebuild_form()
   $form_state['rebuild_info']['copy']['#build_id'] = TRUE;
   $form_state['rebuild_info']['copy']['#action'] = TRUE;
+  $form_state['rebuild_info']['copy']['#cache_token'] = TRUE;
 
   // The form needs to be processed; prepare for that by setting a few internal
   // variables.
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 19993c6..299792d 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -564,7 +564,7 @@ function form_set_cache($form_build_id, $form, $form_state) {
 
   // Cache form structure.
   if (isset($form)) {
-    if ($GLOBALS['user']->uid) {
+    if (empty($form_state['rebuild_info']['copy']['#cache_token']) && $GLOBALS['user']->uid) {
       $form['#cache_token'] = drupal_get_token();
     }
     Drupal::keyValueExpirable('form')->setWithExpire($form_build_id, $form, $expire);
