diff --git a/src/Maker/MakeUser.php b/src/Maker/MakeUser.php
index 27ac037cb..673f4e4d5 100644
--- a/src/Maker/MakeUser.php
+++ b/src/Maker/MakeUser.php
@@ -159,7 +159,10 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $userClassConfiguration->setUserProviderClass('App\\Security\\UserProvider');
             $customProviderPath = $generator->generateClass(
                 $userClassConfiguration->getUserProviderClass(),
-                'security/UserProvider.tpl.php'
+                'security/UserProvider.tpl.php',
+                [
+                    'user_short_name' => $userClassNameDetails->getShortName(),
+                ]
             );
         }
 
diff --git a/src/Resources/skeleton/security/UserProvider.tpl.php b/src/Resources/skeleton/security/UserProvider.tpl.php
index 4c730cf4a..29c27ce62 100644
--- a/src/Resources/skeleton/security/UserProvider.tpl.php
+++ b/src/Resources/skeleton/security/UserProvider.tpl.php
@@ -42,11 +42,11 @@ public function loadUserByUsername($username)
      */
     public function refreshUser(UserInterface $user)
     {
-        if (!$user instanceof User) {
+        if (!$user instanceof <?= $user_short_name ?>) {
             throw new UnsupportedUserException(sprintf('Invalid user class "%s".', get_class($user)));
         }
 
-        /* @var User $user */
+        /* @var <?= $user_short_name ?> $user */
 
         // Return a User object after making sure its data is "fresh".
         // Or throw a UsernameNotFoundException if the user no longer exists.
@@ -58,6 +58,6 @@ public function refreshUser(UserInterface $user)
      */
     public function supportsClass($class)
     {
-        return User::class === $class;
+        return <?= $user_short_name ?>::class === $class;
     }
 }
diff --git a/tests/Maker/FunctionalTest.php b/tests/Maker/FunctionalTest.php
index 1f7178862..c01429ea9 100644
--- a/tests/Maker/FunctionalTest.php
+++ b/tests/Maker/FunctionalTest.php
@@ -544,8 +544,8 @@ function (string $output, string $directory) {
         yield 'user_security_model_no_password' => [MakerTestDetails::createTest(
             $this->getMakerInstance(MakeUser::class),
             [
-                // user class name
-                'User',
+                // user class name (with non-traditional name)
+                'FunUser',
                 'n', // entity
                 'username', // identity property
                 'n', // login with password?
diff --git a/tests/fixtures/MakeUserModelNoPassword/src/Security/AutomaticAuthenticator.php b/tests/fixtures/MakeUserModelNoPassword/src/Security/AutomaticAuthenticator.php
index 65cec60a7..75e169fb0 100644
--- a/tests/fixtures/MakeUserModelNoPassword/src/Security/AutomaticAuthenticator.php
+++ b/tests/fixtures/MakeUserModelNoPassword/src/Security/AutomaticAuthenticator.php
@@ -32,7 +32,7 @@ public function getCredentials(Request $request)
 
     public function getUser($credentials, UserProviderInterface $userProvider)
     {
-        $user = new User();
+        $user = new FunUser();
         $user->setUsername($credentials);
 
         return $user;