diff --git a/composer.json b/composer.json
index 1127e5f2..5884655e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,8 @@
         "symfony/framework-bundle": "^5.4 | ^6.0 | ^7.0",
         "symfony/phpunit-bridge": "^5.4 | ^6.0 | ^7.0",
         "doctrine/doctrine-bundle": "^2.8",
-        "doctrine/annotations": "^1.0"
+        "doctrine/annotations": "^1.0",
+        "symfony/maker-bundle": "^1.53"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/MakerBundle/MakeResetPassword.php b/src/MakerBundle/MakeResetPassword.php
new file mode 100644
index 00000000..c2f6c837
--- /dev/null
+++ b/src/MakerBundle/MakeResetPassword.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the SymfonyCasts ResetPasswordBundle package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SymfonyCasts\Bundle\ResetPassword\MakerBundle;
+
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Bundle\MakerBundle\ConsoleStyle;
+use Symfony\Bundle\MakerBundle\DependencyBuilder;
+use Symfony\Bundle\MakerBundle\Generator;
+use Symfony\Bundle\MakerBundle\InputConfiguration;
+use Symfony\Bundle\MakerBundle\MakerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+use Symfony\Component\Translation\Translator;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Yaml\Yaml;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class MakeResetPassword implements MakerInterface
+{
+    public static function getCommandName(): string
+    {
+        return 'make:rp-bundle';
+    }
+
+    public static function getCommandDescription(): string
+    {
+        return 'Some Description';
+    }
+
+    /**
+     * Configure the command: set description, input arguments, options, etc.
+     *
+     * By default, all arguments will be asked interactively. If you want
+     * to avoid that, use the $inputConfig->setArgumentAsNonInteractive() method.
+     */
+    public function configureCommand(Command $command, InputConfiguration $inputConfig): void
+    {
+    }
+
+    /**
+     * Configure any library dependencies that your maker requires.
+     */
+    public function configureDependencies(DependencyBuilder $dependencies): void
+    {
+    }
+
+    public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
+    {
+        $io->title('Let\'s make a password reset feature!');
+    }
+
+    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
+    {
+    }
+}
diff --git a/src/MakerBundle/Templates/ChangePasswordFormType.tpl.php b/src/MakerBundle/Templates/ChangePasswordFormType.tpl.php
new file mode 100644
index 00000000..b72d2580
--- /dev/null
+++ b/src/MakerBundle/Templates/ChangePasswordFormType.tpl.php
@@ -0,0 +1,48 @@
+<?php echo "<?php\n"; ?>
+
+namespace <?php echo $namespace; ?>;
+
+<?php echo $use_statements; ?>
+
+class <?php echo $class_name; ?> extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('plainPassword', RepeatedType::class, [
+                'type' => PasswordType::class,
+                'options' => [
+                    'attr' => [
+                        'autocomplete' => 'new-password',
+                    ],
+                ],
+                'first_options' => [
+                    'constraints' => [
+                        new NotBlank([
+                            'message' => 'Please enter a password',
+                        ]),
+                        new Length([
+                            'min' => 6,
+                            'minMessage' => 'Your password should be at least {{ limit }} characters',
+                            // max length allowed by Symfony for security reasons
+                            'max' => 4096,
+                        ]),
+                    ],
+                    'label' => 'New password',
+                ],
+                'second_options' => [
+                    'label' => 'Repeat Password',
+                ],
+                'invalid_message' => 'The password fields must match.',
+                // Instead of being set onto the object directly,
+                // this is read and encoded in the controller
+                'mapped' => false,
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+}
diff --git a/src/MakerBundle/Templates/ResetPasswordController.tpl.php b/src/MakerBundle/Templates/ResetPasswordController.tpl.php
new file mode 100644
index 00000000..2762e5f8
--- /dev/null
+++ b/src/MakerBundle/Templates/ResetPasswordController.tpl.php
@@ -0,0 +1,160 @@
+<?php echo "<?php\n"; ?>
+
+namespace <?php echo $namespace; ?>;
+
+<?php echo $use_statements; ?>
+
+#[Route('/reset-password')]
+class <?php echo $class_name; ?> extends AbstractController
+{
+    use ResetPasswordControllerTrait;
+
+    public function __construct(
+        private ResetPasswordHelperInterface $resetPasswordHelper,
+        private EntityManagerInterface $entityManager
+    ) {
+    }
+
+    /**
+     * Display & process form to request a password reset.
+     */
+    #[Route('', name: 'app_forgot_password_request')]
+    public function request(Request $request, MailerInterface $mailer<?php if ($translator_available) { ?>, TranslatorInterface $translator<?php } ?>): Response
+    {
+        $form = $this->createForm(<?php echo $request_form_type_class_name; ?>::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            return $this->processSendingPasswordResetEmail(
+                $form->get('<?php echo $email_field; ?>')->getData(),
+                $mailer<?php if ($translator_available) { ?>,
+                $translator<?php } ?><?php echo "\n"; ?>
+            );
+        }
+
+        return $this->render('reset_password/request.html.twig', [
+            'requestForm' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Confirmation page after a user has requested a password reset.
+     */
+    #[Route('/check-email', name: 'app_check_email')]
+    public function checkEmail(): Response
+    {
+        // Generate a fake token if the user does not exist or someone hit this page directly.
+        // This prevents exposing whether or not a user was found with the given email address or not
+        if (null === ($resetToken = $this->getTokenObjectFromSession())) {
+            $resetToken = $this->resetPasswordHelper->generateFakeResetToken();
+        }
+
+        return $this->render('reset_password/check_email.html.twig', [
+            'resetToken' => $resetToken,
+        ]);
+    }
+
+    /**
+     * Validates and process the reset URL that the user clicked in their email.
+     */
+    #[Route('/reset/{token}', name: 'app_reset_password')]
+    public function reset(Request $request, UserPasswordHasherInterface $passwordHasher<?php if ($translator_available) { ?>, TranslatorInterface $translator<?php } ?>, string $token = null): Response
+    {
+        if ($token) {
+            // We store the token in session and remove it from the URL, to avoid the URL being
+            // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
+            $this->storeTokenInSession($token);
+
+            return $this->redirectToRoute('app_reset_password');
+        }
+
+        $token = $this->getTokenFromSession();
+        if (null === $token) {
+            throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
+        }
+
+        try {
+            $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
+        } catch (ResetPasswordExceptionInterface $e) {
+            $this->addFlash('reset_password_error', sprintf(
+                '%s - %s',
+                <?php if ($translator_available) { ?>$translator->trans(<?php echo $problem_validate_message_or_constant; ?>, [], 'ResetPasswordBundle')<?php } else { ?><?php echo $problem_validate_message_or_constant; ?><?php } ?>,
+                <?php if ($translator_available) { ?>$translator->trans($e->getReason(), [], 'ResetPasswordBundle')<?php } else { ?>$e->getReason()<?php } ?><?php echo "\n"; ?>
+            ));
+
+            return $this->redirectToRoute('app_forgot_password_request');
+        }
+
+        // The token is valid; allow the user to change their password.
+        $form = $this->createForm(<?php echo $reset_form_type_class_name; ?>::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            // A password reset token should be used only once, remove it.
+            $this->resetPasswordHelper->removeResetRequest($token);
+
+            // Encode(hash) the plain password, and set it.
+            $encodedPassword = $passwordHasher->hashPassword(
+                $user,
+                $form->get('plainPassword')->getData()
+            );
+
+            $user-><?php echo $password_setter; ?>($encodedPassword);
+            $this->entityManager->flush();
+
+            // The session is cleaned up after the password has been changed.
+            $this->cleanSessionAfterReset();
+
+            return $this->redirectToRoute('<?php echo $success_redirect_route; ?>');
+        }
+
+        return $this->render('reset_password/reset.html.twig', [
+            'resetForm' => $form->createView(),
+        ]);
+    }
+
+    private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer<?php if ($translator_available) { ?>, TranslatorInterface $translator<?php } ?>): RedirectResponse
+    {
+        $user = $this->entityManager->getRepository(<?php echo $user_class_name; ?>::class)->findOneBy([
+            '<?php echo $email_field; ?>' => $emailFormData,
+        ]);
+
+        // Do not reveal whether a user account was found or not.
+        if (!$user) {
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        try {
+            $resetToken = $this->resetPasswordHelper->generateResetToken($user);
+        } catch (ResetPasswordExceptionInterface $e) {
+            // If you want to tell the user why a reset email was not sent, uncomment
+            // the lines below and change the redirect to 'app_forgot_password_request'.
+            // Caution: This may reveal if a user is registered or not.
+            //
+            // $this->addFlash('reset_password_error', sprintf(
+            //     '%s - %s',
+            //     <?php if ($translator_available) { ?>$translator->trans(<?php echo $problem_handle_message_or_constant; ?>, [], 'ResetPasswordBundle')<?php } else { ?><?php echo $problem_handle_message_or_constant; ?><?php } ?>,
+            //     <?php if ($translator_available) { ?>$translator->trans($e->getReason(), [], 'ResetPasswordBundle')<?php } else { ?>$e->getReason()<?php } ?><?php echo "\n"; ?>
+            // ));
+
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        $email = (new TemplatedEmail())
+            ->from(new Address('<?php echo $from_email; ?>', '<?php echo $from_email_name; ?>'))
+            ->to($user-><?php echo $email_getter; ?>())
+            ->subject('Your password reset request')
+            ->htmlTemplate('reset_password/email.html.twig')
+            ->context([
+                'resetToken' => $resetToken,
+            ])
+        ;
+
+        $mailer->send($email);
+
+        // Store the token object in session for retrieval in check-email route.
+        $this->setTokenObjectInSession($resetToken);
+
+        return $this->redirectToRoute('app_check_email');
+    }
+}
diff --git a/src/MakerBundle/Templates/ResetPasswordRequest.tpl.php b/src/MakerBundle/Templates/ResetPasswordRequest.tpl.php
new file mode 100644
index 00000000..0bce2832
--- /dev/null
+++ b/src/MakerBundle/Templates/ResetPasswordRequest.tpl.php
@@ -0,0 +1,36 @@
+<?php echo "<?php\n"; ?>
+
+namespace <?php echo $namespace; ?>;
+
+<?php echo $use_statements; ?>
+
+#[ORM\Entity(repositoryClass: ResetPasswordRequestRepository::class)]
+class ResetPasswordRequest implements ResetPasswordRequestInterface
+{
+    use ResetPasswordRequestTrait;
+
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?<?= user_short_class ?> $user = null;
+
+    public function __construct(<?= user_short_class ?> $user, \DateTimeInterface $expiresAt, string $selector, string $hashedToken)
+    {
+        $this->user = $user;
+        $this->initialize($expiresAt, $selector, $hashedToken);
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUser(): <?= user_short_class ?>
+    {
+        return $this->user;
+    }
+}
diff --git a/src/MakerBundle/Templates/ResetPasswordRequestFormType.tpl.php b/src/MakerBundle/Templates/ResetPasswordRequestFormType.tpl.php
new file mode 100644
index 00000000..51d2299f
--- /dev/null
+++ b/src/MakerBundle/Templates/ResetPasswordRequestFormType.tpl.php
@@ -0,0 +1,27 @@
+<?php echo "<?php\n"; ?>
+
+namespace <?php echo $namespace; ?>;
+
+<?php echo $use_statements; ?>
+
+class <?php echo $class_name; ?> extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('<?php echo $email_field; ?>', EmailType::class, [
+                'attr' => ['autocomplete' => 'email'],
+                'constraints' => [
+                    new NotBlank([
+                        'message' => 'Please enter your email',
+                    ]),
+                ],
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+}
diff --git a/src/MakerBundle/Templates/twig_check_email.tpl.php b/src/MakerBundle/Templates/twig_check_email.tpl.php
new file mode 100644
index 00000000..786819b3
--- /dev/null
+++ b/src/MakerBundle/Templates/twig_check_email.tpl.php
@@ -0,0 +1,11 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Password Reset Email Sent{% endblock %}
+
+{% block body %}
+    <p>
+        If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.
+        This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
+    </p>
+    <p>If you don't receive an email please check your spam folder or <a href="{{ path('app_forgot_password_request') }}">try again</a>.</p>
+{% endblock %}
diff --git a/src/MakerBundle/Templates/twig_email.tpl.php b/src/MakerBundle/Templates/twig_email.tpl.php
new file mode 100644
index 00000000..824a2186
--- /dev/null
+++ b/src/MakerBundle/Templates/twig_email.tpl.php
@@ -0,0 +1,9 @@
+<h1>Hi!</h1>
+
+<p>To reset your password, please visit the following link</p>
+
+<a href="{{ url('app_reset_password', {token: resetToken.token}) }}">{{ url('app_reset_password', {token: resetToken.token}) }}</a>
+
+<p>This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.</p>
+
+<p>Cheers!</p>
diff --git a/src/MakerBundle/Templates/twig_request.tpl.php b/src/MakerBundle/Templates/twig_request.tpl.php
new file mode 100644
index 00000000..edfd28e2
--- /dev/null
+++ b/src/MakerBundle/Templates/twig_request.tpl.php
@@ -0,0 +1,22 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Reset your password{% endblock %}
+
+{% block body %}
+    {% for flash_error in app.flashes('reset_password_error') %}
+        <div class="alert alert-danger" role="alert">{{ flash_error }}</div>
+    {% endfor %}
+    <h1>Reset your password</h1>
+
+    {{ form_start(requestForm) }}
+        {{ form_row(requestForm.<?php echo $email_field; ?>) }}
+        <div>
+            <small>
+                Enter your email address and we will send you a
+                link to reset your password.
+            </small>
+        </div>
+
+        <button class="btn btn-primary">Send password reset email</button>
+    {{ form_end(requestForm) }}
+{% endblock %}
diff --git a/src/MakerBundle/Templates/twig_reset.tpl.php b/src/MakerBundle/Templates/twig_reset.tpl.php
new file mode 100644
index 00000000..799aa10f
--- /dev/null
+++ b/src/MakerBundle/Templates/twig_reset.tpl.php
@@ -0,0 +1,12 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Reset your password{% endblock %}
+
+{% block body %}
+    <h1>Reset your password</h1>
+
+    {{ form_start(resetForm) }}
+        {{ form_row(resetForm.plainPassword) }}
+        <button class="btn btn-primary">Reset password</button>
+    {{ form_end(resetForm) }}
+{% endblock %}
diff --git a/tests/Maker/MakerTest.php b/tests/Maker/MakerTest.php
new file mode 100644
index 00000000..36209805
--- /dev/null
+++ b/tests/Maker/MakerTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Maker;
+
+use Symfony\Bundle\MakerBundle\Test\MakerTestCase;
+use Symfony\Bundle\MakerBundle\Test\MakerTestRunner;
+use SymfonyCasts\Bundle\ResetPassword\MakerBundle\MakeResetPassword;
+
+class MakerTest extends MakerTestCase
+{
+    public function getTestDetails(): \Generator
+    {
+        yield 'it_does_something' => [$this->createMakerTest()
+            ->run(static function (MakerTestRunner $runner) {
+                $output = $runner->runMaker([]);
+
+                self::assertStringContainsString('Let\'s make a password reset feature!', $output);
+            })
+        ];
+    }
+
+    protected function getMakerClass(): string
+    {
+        return MakeResetPassword::class;
+    }
+}