diff --git a/src/Controller/DiscourseSsoController.php b/src/Controller/DiscourseSsoController.php
index e5b3c80..6b794fe 100644
--- a/src/Controller/DiscourseSsoController.php
+++ b/src/Controller/DiscourseSsoController.php
@@ -55,7 +55,7 @@ class DiscourseSsoController extends ControllerBase {
       drupal_access_denied();
     }
 
-    $account = \Drupal::entityManager()->getStorage('user')->load(\Drupal::currentUser()->id());
+    $account = \Drupal::entityTypeManager()->getStorage('user')->load(\Drupal::currentUser()->id());
     $picture = !empty($account->get('user_picture')->getValue())
              ? $account->get('user_picture')->entity->toUrl()->toString(TRUE)
              : '';
diff --git a/src/Form/DiscourseSsoAdminForm.php b/src/Form/DiscourseSsoAdminForm.php
index d1818bd..8d00be6 100644
--- a/src/Form/DiscourseSsoAdminForm.php
+++ b/src/Form/DiscourseSsoAdminForm.php
@@ -98,7 +98,7 @@ class DiscourseSsoAdminForm extends FormBase {
   protected function getTextFieldsByEntityTypeBundle($entity_type, $bundle) {
     $bundleFields = [];
 
-    $fields = \Drupal::entityManager()->getFieldDefinitions($entity_type, $bundle);
+    $fields = \Drupal::entityTypeManager()->getFieldDefinitions($entity_type, $bundle);
     foreach ($fields as $field_name => $field_definition) {
       if (!empty($field_definition->getTargetBundle())) {
         if ($field_definition->getType() === 'string') {