diff --git a/src/MessageProcessor.php b/src/MessageProcessor.php
index 636acee..a63eb2e 100644
--- a/src/MessageProcessor.php
+++ b/src/MessageProcessor.php
@@ -109,7 +109,8 @@ class MessageProcessor implements MessageProcessorInterface {
     /** @var \Drupal\inmail\DefaultAnalyzerResult $default_result */
     $default_result = $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     // Enabled analyzers will be able to update the account.
-    $default_result->setAccount(User::getAnonymousUser());
+    $anonymous_user = User::getAnonymousUser();
+    $default_result->setAccount($anonymous_user);
 
     $analyzer_configs = $this->analyzerStorage->loadMultiple();
     uasort($analyzer_configs, array($this->analyzerStorage->getEntityType()->getClass(), 'sort'));
@@ -126,10 +127,10 @@ class MessageProcessor implements MessageProcessorInterface {
       $event and $event->addArgument(get_class($analyzer_result), $analyzer_result->summarize());
     }
 
-    // Switch the user context.
-    // @todo: Replace anonymous user with the default user after
-    //    https://www.drupal.org/node/2754253 gets in.
-    $this->accountSwitcher->switchTo(User::getAnonymousUser());
+    // Conditionally switch to the account identified by analyzers.
+    if ($default_result->getAccount() != $anonymous_user) {
+      $this->accountSwitcher->switchTo($default_result->getAccount());
+    }
 
     // Handle message.
     foreach ($this->handlerStorage->loadMultiple() as $handler_config) {
@@ -141,8 +142,10 @@ class MessageProcessor implements MessageProcessorInterface {
       }
     }
 
-    // Switch back to a previous account.
-    $this->accountSwitcher->switchBack();
+    if ($default_result->getAccount() != $anonymous_user) {
+      // Switch back to a previous account.
+      $this->accountSwitcher->switchBack();
+    }
 
     if ($event) {
       // Dump all log items into a past argument per source.
diff --git a/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php b/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
index 12a8cc8..e11389d 100644
--- a/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
+++ b/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
@@ -8,6 +8,7 @@ use Drupal\inmail\DefaultAnalyzerResult;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
+use Drupal\user\Entity\User;
 
 /**
  * Provides a test analyzer.
@@ -28,6 +29,16 @@ class TestAnalyzer extends AnalyzerBase {
 
     // Provide sample context.
     $this->addContext($default_result);
+
+    // Update default result with example account.
+    $users = \Drupal::entityTypeManager()->getStorage('user')->loadByProperties(['mail' => 'demo@example.com']);
+    if (!$demo_user = reset($users)) {
+      $demo_user = User::create([
+        'mail' => 'demo@example.com',
+        'name' => 'Demo User',
+      ]);
+    }
+    $default_result->setAccount($demo_user);
   }
 
   /**
diff --git a/tests/modules/inmail_test/src/Plugin/inmail/Handler/ResultKeeperHandler.php b/tests/modules/inmail_test/src/Plugin/inmail/Handler/ResultKeeperHandler.php
index 1aa1734..98abcf4 100644
--- a/tests/modules/inmail_test/src/Plugin/inmail/Handler/ResultKeeperHandler.php
+++ b/tests/modules/inmail_test/src/Plugin/inmail/Handler/ResultKeeperHandler.php
@@ -30,6 +30,7 @@ class ResultKeeperHandler extends HandlerBase {
   public function invoke(MessageInterface $message, ProcessorResultInterface $processor_result) {
     \Drupal::state()->set('inmail_test.result_keeper.message', $message);
     \Drupal::state()->set('inmail_test.result_keeper.result', $processor_result);
+    \Drupal::state()->set('inmail_test.result_keeper.account_name', \Drupal::currentUser()->getDisplayName());
   }
 
   /**
@@ -52,4 +53,14 @@ class ResultKeeperHandler extends HandlerBase {
     return \Drupal::state()->get('inmail_test.result_keeper.result');
   }
 
+  /**
+   * Returns the account display name.
+   *
+   * @return string
+   *   The account display name.
+   */
+  public static function getAccountName() {
+    return \Drupal::state()->get('inmail_test.result_keeper.account_name');
+  }
+
 }
diff --git a/tests/src/Kernel/AnalyzerTest.php b/tests/src/Kernel/AnalyzerTest.php
index f4f6e31..db1127b 100644
--- a/tests/src/Kernel/AnalyzerTest.php
+++ b/tests/src/Kernel/AnalyzerTest.php
@@ -32,6 +32,7 @@ class AnalyzerTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
+    $this->installEntitySchema('user');
     $this->installConfig(['inmail']);
     \Drupal::configFactory()->getEditable('inmail.settings')
       ->set('return_path', 'bounces@example.com')
diff --git a/tests/src/Kernel/HandlerTest.php b/tests/src/Kernel/HandlerTest.php
new file mode 100644
index 0000000..902f58a
--- /dev/null
+++ b/tests/src/Kernel/HandlerTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\inmail\Kernel;
+
+use Drupal\inmail\Entity\AnalyzerConfig;
+use Drupal\inmail\Entity\DelivererConfig;
+use Drupal\inmail\Entity\HandlerConfig;
+use Drupal\inmail\DefaultAnalyzerResult;
+use Drupal\inmail_test\Plugin\inmail\Handler\ResultKeeperHandler;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests handlers.
+ *
+ * @group inmail
+ */
+class HandlerTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('inmail', 'inmail_test', 'user');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+  }
+
+  /**
+   * Tests account switching mechanism.
+   */
+  public function testAccountSwitching() {
+    $raw = <<<EOF
+Subject: Hello!
+From: Demo User <demo@example.com>
+To: receiver@example.com
+
+Hello world!
+EOF;
+
+    /** @var \Drupal\inmail\MessageProcessorInterface $processor */
+    $processor = \Drupal::service('inmail.processor');
+
+    AnalyzerConfig::create(['id' => 'test_analyzer', 'plugin' => 'test_analyzer'])->save();
+    HandlerConfig::create(['id' => 'result_keeper', 'plugin' => 'result_keeper'])->save();
+    $processor->process($raw, DelivererConfig::create(['id' => 'test']));
+
+    $processor_result = ResultKeeperHandler::getResult();
+    /** @var \Drupal\inmail\DefaultAnalyzerResult $default_result */
+    $default_result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
+
+    // Assert "Test Analyzer" updated the account on default result.
+    $this->assertEquals('Demo User', $default_result->getAccount()->getDisplayName());
+    // Assert the account was switched on handler's level.
+    $this->assertEquals('Demo User', ResultKeeperHandler::getAccountName());
+  }
+
+}