diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13de025e..77dc826e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#improved)
     * Improved the UI for the Parent Page Route dropdown when adding a new Page / Folder
+    * Use `$grav['accounts']` instead of `$grav['users']`
 1. [](#bugfix)
     * Fixed user edit links if Flex Objects plugin is installed but user isn't Flex User
     * Fixed deprecated `sameas()` Twig test
diff --git a/admin.php b/admin.php
index 79581e0c..1bd11def 100644
--- a/admin.php
+++ b/admin.php
@@ -300,7 +300,7 @@ class AdminPlugin extends Plugin
                 $data['access'] = ['admin' => ['login' => true, 'super' => true], 'site' => ['login' => true]];
 
                 /** @var UserCollectionInterface $users */
-                $users = $this->grav['users'];
+                $users = $this->grav['accounts'];
 
                 // Create user object and save it
                 $user = $users->load($username);
diff --git a/classes/admin.php b/classes/admin.php
index 13d09060..1213d5ed 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -652,7 +652,7 @@ class Admin
             $data[$type] = $obj;
         } elseif (preg_match('|users/|', $type)) {
             /** @var UserCollectionInterface $users */
-            $users = $this->grav['users'];
+            $users = $this->grav['accounts'];
 
             $obj = $users->load(preg_replace('|users/|', '', $type));
             $obj->update($this->cleanUserPost($post));
@@ -660,7 +660,7 @@ class Admin
             $data[$type] = $obj;
         } elseif (preg_match('|user/|', $type)) {
             /** @var UserCollectionInterface $users */
-            $users = $this->grav['users'];
+            $users = $this->grav['accounts'];
 
             $obj = $users->load(preg_replace('|user/|', '', $type));
             $obj->update($this->cleanUserPost($post));
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index b61fd72f..859be007 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -147,7 +147,7 @@ class AdminController extends AdminBaseController
 
         if (isset($data['password'])) {
             /** @var UserCollectionInterface $users */
-            $users = $this->grav['users'];
+            $users = $this->grav['accounts'];
 
             $username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : null;
             $user     = $username ? $users->load($username) : null;
@@ -217,7 +217,7 @@ class AdminController extends AdminBaseController
         $login     = $this->grav['login'];
 
         /** @var UserCollectionInterface $users */
-        $users = $this->grav['users'];
+        $users = $this->grav['accounts'];
 
         $username = isset($data['username']) ? strip_tags(strtolower($data['username'])) : '';
         $user     = !empty($username) ? $users->load($username) : null;
@@ -685,7 +685,7 @@ class AdminController extends AdminBaseController
             if ($this->view === 'user') {
                 if ($obj->username === $this->grav['user']->username) {
                     /** @var UserCollectionInterface $users */
-                    $users = $this->grav['users'];
+                    $users = $this->grav['accounts'];
 
                     //Editing current user. Reload user object
                     unset($this->grav['user']->avatar);
diff --git a/classes/utils.php b/classes/utils.php
index 44ee974c..067764b9 100644
--- a/classes/utils.php
+++ b/classes/utils.php
@@ -25,7 +25,7 @@ class Utils
         $grav = Grav::instance();
 
         /** @var UserCollectionInterface $users */
-        $users = $grav['users'];
+        $users = $grav['accounts'];
 
         return $users->find($email, ['email']);
     }