diff --git a/src/Maker/MakeRegistrationForm.php b/src/Maker/MakeRegistrationForm.php
index 8162be5ef..43b1f9980 100644
--- a/src/Maker/MakeRegistrationForm.php
+++ b/src/Maker/MakeRegistrationForm.php
@@ -501,6 +501,7 @@ private function generateFormClass(ClassNameDetails $userClassDetails, Generator
                 // instead of being set onto the object directly,
                 // this is read and encoded in the controller
                 'mapped' => false,
+                'attr' => ['autocomplete' => 'new-password'],
                 'constraints' => [
                     new NotBlank([
                         'message' => 'Please enter a password',
diff --git a/src/Resources/skeleton/authenticator/login_form.tpl.php b/src/Resources/skeleton/authenticator/login_form.tpl.php
index 6c2a1bd03..c84adfe21 100644
--- a/src/Resources/skeleton/authenticator/login_form.tpl.php
+++ b/src/Resources/skeleton/authenticator/login_form.tpl.php
@@ -18,9 +18,9 @@
 
     <h1 class="h3 mb-3 font-weight-normal">Please sign in</h1>
     <label for="input<?= ucfirst($username_field); ?>"><?= $username_label; ?></label>
-    <input type="<?= $username_is_email ? 'email' : 'text'; ?>" value="{{ last_username }}" name="<?= $username_field; ?>" id="input<?= ucfirst($username_field); ?>" class="form-control" required autofocus>
+    <input type="<?= $username_is_email ? 'email' : 'text'; ?>" value="{{ last_username }}" name="<?= $username_field; ?>" id="input<?= ucfirst($username_field); ?>" class="form-control" autocomplete="<?= $username_is_email ? 'email' : 'username'; ?>" required autofocus>
     <label for="inputPassword">Password</label>
-    <input type="password" name="password" id="inputPassword" class="form-control" required>
+    <input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password" required>
 
     <input type="hidden" name="_csrf_token"
            value="{{ csrf_token('authenticate') }}"
diff --git a/src/Resources/skeleton/resetPassword/ChangePasswordFormType.tpl.php b/src/Resources/skeleton/resetPassword/ChangePasswordFormType.tpl.php
index 7eb7f07cd..3873496fc 100644
--- a/src/Resources/skeleton/resetPassword/ChangePasswordFormType.tpl.php
+++ b/src/Resources/skeleton/resetPassword/ChangePasswordFormType.tpl.php
@@ -18,6 +18,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('plainPassword', RepeatedType::class, [
                 'type' => PasswordType::class,
                 'first_options' => [
+                    'attr' => ['autocomplete' => 'new-password'],
                     'constraints' => [
                         new NotBlank([
                             'message' => 'Please enter a password',
@@ -32,6 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'label' => 'New password',
                 ],
                 'second_options' => [
+                    'attr' => ['autocomplete' => 'new-password'],
                     'label' => 'Repeat Password',
                 ],
                 'invalid_message' => 'The password fields must match.',
diff --git a/src/Resources/skeleton/resetPassword/ResetPasswordRequestFormType.tpl.php b/src/Resources/skeleton/resetPassword/ResetPasswordRequestFormType.tpl.php
index e277cb4bb..736df3085 100644
--- a/src/Resources/skeleton/resetPassword/ResetPasswordRequestFormType.tpl.php
+++ b/src/Resources/skeleton/resetPassword/ResetPasswordRequestFormType.tpl.php
@@ -14,6 +14,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('<?= $email_field ?>', EmailType::class, [
+                'attr' => ['autocomplete' => 'email'],
                 'constraints' => [
                     new NotBlank([
                         'message' => 'Please enter your email',