diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index a897625..35fc786 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Entity\EntityFormControllerNG;
 use Drupal\Core\Language\Language;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -17,8 +18,9 @@
 abstract class AccountFormController extends EntityFormControllerNG {
 
   /**
+   * The entity query factory service.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
+   * @var \Drupal\Core\Entity\Query\QueryFactory
    */
   protected $entityQuery;
 
@@ -27,14 +29,14 @@
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.query')->get('user')
+      $container->get('entity.query')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(QueryInterface $entity_query) {
+  public function __construct(QueryFactory $entity_query) {
     $this->entityQuery = $entity_query;
   }
 
@@ -281,7 +283,7 @@ public function validate(array $form, array &$form_state) {
       // Cast the user ID as an integer. It might have been set to NULL, which
       // could lead to unexpected results.
       else {
-        $name_taken = (bool) $this->entityQuery
+        $name_taken = (bool) $this->entityQuery->get('user')
           ->condition('uid', (int) $account->id(), '<>')
           ->condition('name', db_like($form_state['values']['name']), 'LIKE')
           ->range(0, 1)
@@ -297,7 +299,7 @@ public function validate(array $form, array &$form_state) {
     $mail = $form_state['values']['mail'];
 
     if (!empty($mail)) {
-      $mail_taken = (bool) $this->entityQuery
+      $mail_taken = (bool) $this->entityQuery->get('user')
         ->condition('uid', (int) $account->id(), '<>')
         ->condition('mail', db_like($mail), 'LIKE')
         ->range(0, 1)
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index daf4a8f..b8050c8 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -10,6 +10,7 @@
 use Drupal\block\BlockBase;
 use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -24,8 +25,9 @@
 class UserNewBlock extends BlockBase implements ContainerFactoryPluginInterface {
 
   /**
+   * The entity query factory service.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
+   * @var \Drupal\Core\Entity\Query\QueryFactory
    */
   protected $entityQuery;
 
@@ -37,14 +39,14 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.query')->get('user')
+      $container->get('entity.query')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, QueryInterface $entity_query) {
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, QueryFactory $entity_query) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityQuery = $entity_query;
   }
@@ -93,7 +95,7 @@ public function blockSubmit($form, &$form_state) {
    */
   public function build() {
     // Retrieve a list of new users who have accessed the site successfully.
-    $uids = $this->entityQuery
+    $uids = $this->entityQuery->get('user')
       ->condition('status', 0, '<>')
       ->condition('access', 0, '<>')
       ->sort('created', 'DESC')
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
index 978b29a..f6c5321 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
@@ -10,7 +10,7 @@
 use Drupal\block\BlockBase;
 use Drupal\block\Annotation\Block;
 use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Entity\Query\QueryInterface;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -28,8 +28,9 @@
 class UserOnlineBlock extends BlockBase implements ContainerFactoryPluginInterface {
 
   /**
+   * The entity query factory service.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
+   * @var \Drupal\Core\Entity\Query\QueryFactory
    */
   protected $entityQuery;
 
@@ -41,14 +42,14 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.query')->get('user')
+      $container->get('entity.query')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, QueryInterface $entity_query) {
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, QueryFactory $entity_query) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityQuery = $entity_query;
   }
@@ -111,7 +112,7 @@ public function build() {
     $interval = REQUEST_TIME - $this->configuration['seconds_online'];
 
     // Perform database queries to gather online user lists.
-    $authenticated_count = \Drupal::entityQuery('user')
+    $authenticated_count = $this->entityQuery->get('user')
       ->condition('access', $interval, '>=')
       ->count()
       ->execute();
@@ -124,7 +125,7 @@ public function build() {
     // Display a list of currently online users.
     $max_users = $this->configuration['max_list_count'];
     if ($authenticated_count && $max_users) {
-      $uids = $this->entityQuery
+      $uids = $this->entityQuery->get('user')
         ->condition('access', $interval, '>=')
         ->condition('uid', 0, '>')
         ->sort('access', 'DESC')
diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/lib/Drupal/user/ProfileFormController.php
index d11fac6..81c8c60 100644
--- a/core/modules/user/lib/Drupal/user/ProfileFormController.php
+++ b/core/modules/user/lib/Drupal/user/ProfileFormController.php
@@ -8,6 +8,7 @@
 namespace Drupal\user;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -19,7 +20,7 @@ class ProfileFormController extends AccountFormController {
   /**
    * {@inheritdoc}
    */
-  public function __construct(QueryInterface $entity_query) {
+  public function __construct(QueryFactory $entity_query) {
     parent::__construct($entity_query);
   }
 
diff --git a/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/lib/Drupal/user/RegisterFormController.php
index 3bf2d45..ab74f71 100644
--- a/core/modules/user/lib/Drupal/user/RegisterFormController.php
+++ b/core/modules/user/lib/Drupal/user/RegisterFormController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user;
 
+use Drupal\Core\Entity\Query\QueryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
diff --git a/core/modules/user/lib/Drupal/user/UserAutocomplete.php b/core/modules/user/lib/Drupal/user/UserAutocomplete.php
index 2e3e97e..c0873db 100644
--- a/core/modules/user/lib/Drupal/user/UserAutocomplete.php
+++ b/core/modules/user/lib/Drupal/user/UserAutocomplete.php
@@ -33,12 +33,14 @@ class UserAutocomplete {
   protected $configFactory;
 
   /**
+   * The entity query factory service.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
+   * @var \Drupal\Core\Entity\Query\QueryFactory
    */
   protected $entityQuery;
 
   /**
+   * The entity manager service.
    *
    * @var \Drupal\Core\Entity\EntityManager
    */
@@ -52,10 +54,10 @@ class UserAutocomplete {
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory.
    */
-  public function __construct(Connection $connection, ConfigFactory $config_factory, QueryFactory $query_factory, EntityManager $entity_manager) {
+  public function __construct(Connection $connection, ConfigFactory $config_factory, EntityManager $entity_manager, QueryFactory $entity_query) {
     $this->connection = $connection;
     $this->configFactory = $config_factory;
-    $this->entityQuery = $query_factory->get('user');
+    $this->entityQuery = $entity_query;
     $this->entityManager = $entity_manager;
   }
 
@@ -83,7 +85,7 @@ public function getMatches($string, $include_anonymous = FALSE) {
         }
       }
 
-      $uids = $this->entityQuery
+      $uids = $this->entityQuery->get('user')
         ->condition('name', $string, 'STARTS_WITH')
         ->range(0, 10)
         ->execute();
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 164471b..c1cc9fb 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -20,7 +20,7 @@ services:
     arguments: ['@database']
   user.autocomplete:
     class: Drupal\user\UserAutocomplete
-    arguments: ['@database', '@config.factory', '@entity.query', '@entity.manager']
+    arguments: ['@database', '@config.factory', '@entity.manager', '@entity.query']
   user_maintenance_mode_subscriber:
     class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
     tags: