diff --git a/src/Resources/skeleton/registration/RegistrationController.tpl.php b/src/Resources/skeleton/registration/RegistrationController.tpl.php
index 77969a1cf..ad3707910 100644
--- a/src/Resources/skeleton/registration/RegistrationController.tpl.php
+++ b/src/Resources/skeleton/registration/RegistrationController.tpl.php
@@ -20,13 +20,11 @@ public function register(Request $request, UserPasswordHasherInterface $userPass
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            /** @var string $plainPassword */
+            $plainPassword = $form->get('plainPassword')->getData();
+
             // encode the plain password
-            $user->set<?= ucfirst($password_field) ?>(
-                    $userPasswordHasher->hashPassword(
-                    $user,
-                    $form->get('plainPassword')->getData()
-                )
-            );
+            $user->set<?= ucfirst($password_field) ?>($userPasswordHasher->hashPassword($user, $plainPassword));
 
             $entityManager->persist($user);
             $entityManager->flush();
@@ -36,7 +34,7 @@ public function register(Request $request, UserPasswordHasherInterface $userPass
             $this->emailVerifier->sendEmailConfirmation('app_verify_email', $user,
                 (new TemplatedEmail())
                     ->from(new Address('<?= $from_email ?>', '<?= $from_email_name ?>'))
-                    ->to($user-><?= $email_getter ?>())
+                    ->to((string) $user-><?= $email_getter ?>())
                     ->subject('Please Confirm your Email')
                     ->htmlTemplate('registration/confirmation_email.html.twig')
             );
@@ -84,7 +82,11 @@ public function verifyUserEmail(Request $request<?php if ($translator_available)
 
         // validate email confirmation link, sets User::isVerified=true and persists
         try {
-            $this->emailVerifier->handleEmailConfirmation($request, <?= $verify_email_anonymously ? '$user' : '$this->getUser()' ?>);
+<?php if (!$verify_email_anonymously): ?>
+            /** @var <?= $user_class_name ?> $user */
+            $user = $this->getUser();
+<?php endif; ?>
+            $this->emailVerifier->handleEmailConfirmation($request, $user);
         } catch (VerifyEmailExceptionInterface $exception) {
             $this->addFlash('verify_email_error', <?php if ($translator_available): ?>$translator->trans($exception->getReason(), [], 'VerifyEmailBundle')<?php else: ?>$exception->getReason()<?php endif ?>);
 
diff --git a/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php b/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php
index 5c0864efd..f5e37f7f2 100644
--- a/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php
+++ b/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php
@@ -19,10 +19,10 @@ public function sendEmailConfirmation(string $verifyEmailRouteName, <?= $user_cl
             $verifyEmailRouteName,
             (string) $user-><?= $id_getter ?>(),
 <?php if ($verify_email_anonymously): ?>
-            $user-><?= $email_getter ?>(),
+            (string) $user-><?= $email_getter ?>(),
             ['id' => $user-><?= $id_getter ?>()]
 <?php else: ?>
-            $user-><?= $email_getter ?>()
+            (string) $user-><?= $email_getter ?>()
 <?php endif; ?>
         );
 
@@ -41,7 +41,7 @@ public function sendEmailConfirmation(string $verifyEmailRouteName, <?= $user_cl
      */
     public function handleEmailConfirmation(Request $request, <?= $user_class_name ?> $user): void
     {
-        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user-><?= $id_getter ?>(), $user-><?= $email_getter?>());
+        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user-><?= $id_getter ?>(), (string) $user-><?= $email_getter?>());
 
         $user->setVerified(true);
 
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php
index 962473b6a..97e5428e7 100644
--- a/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php
+++ b/tests/fixtures/make-registration-form/expected/RegistrationControllerCustomAuthenticator.php
@@ -23,13 +23,11 @@ public function register(Request $request, UserPasswordHasherInterface $userPass
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            /** @var string $plainPassword */
+            $plainPassword = $form->get('plainPassword')->getData();
+
             // encode the plain password
-            $user->setPassword(
-                $userPasswordHasher->hashPassword(
-                    $user,
-                    $form->get('plainPassword')->getData()
-                )
-            );
+            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
 
             $entityManager->persist($user);
             $entityManager->flush();
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php
index c42816f1b..1fd6787d8 100644
--- a/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php
+++ b/tests/fixtures/make-registration-form/expected/RegistrationControllerFormLogin.php
@@ -22,13 +22,11 @@ public function register(Request $request, UserPasswordHasherInterface $userPass
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            /** @var string $plainPassword */
+            $plainPassword = $form->get('plainPassword')->getData();
+
             // encode the plain password
-            $user->setPassword(
-                $userPasswordHasher->hashPassword(
-                    $user,
-                    $form->get('plainPassword')->getData()
-                )
-            );
+            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
 
             $entityManager->persist($user);
             $entityManager->flush();
diff --git a/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php b/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php
index 1f29555f5..8863f9342 100644
--- a/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php
+++ b/tests/fixtures/make-registration-form/expected/RegistrationControllerNoLogin.php
@@ -21,13 +21,11 @@ public function register(Request $request, UserPasswordHasherInterface $userPass
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            /** @var string $plainPassword */
+            $plainPassword = $form->get('plainPassword')->getData();
+
             // encode the plain password
-            $user->setPassword(
-                $userPasswordHasher->hashPassword(
-                    $user,
-                    $form->get('plainPassword')->getData()
-                )
-            );
+            $user->setPassword($userPasswordHasher->hashPassword($user, $plainPassword));
 
             $entityManager->persist($user);
             $entityManager->flush();