diff --git a/src/Form/SwitchUserForm.php b/src/Form/SwitchUserForm.php
index 817293a..d1df3b6 100644
--- a/src/Form/SwitchUserForm.php
+++ b/src/Form/SwitchUserForm.php
@@ -8,6 +8,7 @@
 namespace Drupal\devel\Form;
 
 use Drupal\Core\Access\CsrfTokenGenerator;
+use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -25,12 +26,23 @@ class SwitchUserForm extends FormBase {
   protected $csrfTokenGenerator;
 
   /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
    * Constructs a new SwitchUserForm object.
    *
    * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token_generator
+   *   CSRF token manager.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *   The entity manager.
    */
-  public function __construct(CsrfTokenGenerator $csrf_token_generator) {
+  public function __construct(CsrfTokenGenerator $csrf_token_generator, EntityManagerInterface $entity_manager) {
     $this->csrfTokenGenerator = $csrf_token_generator;
+    $this->entityManager = $entity_manager;
   }
 
   /**
@@ -38,7 +50,8 @@ class SwitchUserForm extends FormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('csrf_token')
+      $container->get('csrf_token'),
+      $container->get('entity.manager')
     );
   }
 
@@ -73,7 +86,9 @@ class SwitchUserForm extends FormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    if (!$account = user_load_by_name($form_state->getValue('username'))) {
+    $username = $form_state->getValue('username');
+    $this->entityManager->getStorage('user')->loadByProperties(['name' => 'username']);
+    if (!$account = $this->entityManager->getStorage('user')->loadByProperties(['name' => $username])) {
       $form_state->setErrorByName('username', t('Username not found'));
     }
   }