diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php
index f42c20d..c60d52a 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php
@@ -20,7 +20,6 @@ class ShortcutSetAccessController extends EntityAccessController {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
-    $account = $this->prepareUser($account);
     switch ($operation) {
       case 'update':
         if ($account->hasPermission('administer shortcuts')) {
@@ -44,8 +43,7 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
   /**
   * {@inheritdoc}
    */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = array()) {
-    $account = $this->prepareUser($account);
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
     return $account->hasPermission('administer shortcuts') || $account->hasPermission('customize shortcut links');
   }