diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 4e6a0d5..d4330d5 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -170,8 +170,11 @@ class UserCancelTest extends WebTestBase {
     $account = user_load($account->uid, TRUE);
     $this->assertTrue($account->status == 0, t('User has been blocked.'));
 
-    // Confirm user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    // Confirm that we didn't break Batch API by destroying the session.
+    $this->assertNoText(t('No active batch.'), "Batch API wasn't interrupted by the account cancellation.");
+
+    // Confirm that the confirmation message made it through to the end user.
+    $this->assertText(t('%name has been disabled.', array('%name' => $account->name)), "Confirmation message displayed to user.");
   }
 
   /**
@@ -214,8 +217,11 @@ class UserCancelTest extends WebTestBase {
     $test_node = node_load($node->nid, $node->vid, TRUE);
     $this->assertTrue($test_node->status == 0, t('Node revision of the user has been unpublished.'));
 
-    // Confirm user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    // Confirm that we didn't break Batch API by destroying the session.
+    $this->assertNoText(t('No active batch.'), "Batch API wasn't interrupted by the account cancellation.");
+
+    // Confirm that the confirmation message made it through to the end user.
+    $this->assertText(t('%name has been disabled.', array('%name' => $account->name)), "Confirmation message displayed to user.");
   }
 
   /**
@@ -265,8 +271,11 @@ class UserCancelTest extends WebTestBase {
     $test_node = node_load($revision_node->nid, NULL, TRUE);
     $this->assertTrue(($test_node->uid != 0 && $test_node->status == 1), t("Current revision of the user's node was not attributed to anonymous user."));
 
-    // Confirm that user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    // Confirm that we didn't break Batch API by destroying the session.
+    $this->assertNoText(t('No active batch.'), "Batch API wasn't interrupted by the account cancellation.");
+
+    // Confirm that the confirmation message made it through to the end user.
+    $this->assertText(t('%name has been deleted.', array('%name' => $account->name)), "Confirmation message displayed to user.");
   }
 
   /**
@@ -327,8 +336,11 @@ class UserCancelTest extends WebTestBase {
     $this->assertTrue(node_load($revision_node->nid, NULL, TRUE), t("Current revision of the user's node was not deleted."));
     $this->assertFalse(comment_load($comment->cid), t('Comment of the user has been deleted.'));
 
-    // Confirm that user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    // Confirm that we didn't break Batch API by destroying the session.
+    $this->assertNoText(t('No active batch.'), "Batch API wasn't interrupted by the account cancellation.");
+
+    // Confirm that the confirmation message made it through to the end user.
+    $this->assertText(t('%name has been deleted.', array('%name' => $account->name)), "Confirmation message displayed to user.");
   }
 
   /**
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 53b993f..a40b9e4 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -2223,6 +2223,14 @@ function user_cancel($edit, $uid, $method) {
       array('_user_cancel', array($edit, $account, $method)),
     ),
   );
+
+  // After cancelling account, ensure that user is logged out.
+  if ($account->uid == $user->uid) {
+    // Batch API stores data in the session, so use the finished operation to
+    // manipulate the current user's session.
+    $batch['finished'] = '_user_cancel_session_regenerate';
+  }
+
   batch_set($batch);
 
   // Batch processing is either handled via Form API or has to be invoked
@@ -2266,17 +2274,22 @@ function _user_cancel($edit, $account, $method) {
       break;
   }
 
-  // After cancelling account, ensure that user is logged out.
-  if ($account->uid == $user->uid) {
-    // Destroy the current session, and reset $user to the anonymous user.
-    session_destroy();
-  }
-
   // Clear the cache for anonymous users.
   cache_invalidate(array('content' => TRUE));
 }
 
 /**
+ * Finished batch processing callback for cancelling a user account.
+ *
+ * @see user_cancel()
+ */
+function _user_cancel_session_regenerate() {
+  // Regenerate the users session instead of calling session_destroy() as we
+  // want to preserve any messages that might have been set.
+  drupal_session_regenerate();
+}
+
+/**
  * Delete a user.
  *
  * @param $uid