diff --git a/templates/setup/index.html.twig b/templates/setup/index.html.twig
index bdd5f93..612e020 100644
--- a/templates/setup/index.html.twig
+++ b/templates/setup/index.html.twig
@@ -52,9 +52,21 @@
                 {% endfor %}
             </div>
             <div class="field">
-                {{ form_label(reg_form.plainPassword) }}
-                {{ form_widget(reg_form.plainPassword, {attr: {
+                {{ form_label(reg_form.plainPassword.first) }}
+                {{ form_widget(reg_form.plainPassword.first, {attr: {
                     id: 'reg-pass',
+                    autocomplete: 'new-password',
+                    'aria-invalid': reg_form.plainPassword.first.vars.errors|length > 0 ? 'true' : 'false'
+                }}) }}
+                {% for error in reg_form.plainPassword.first.vars.errors %}
+                    <p class="field-error" role="alert">{{ error.message }}</p>
+                {% endfor %}
+            </div>
+            <div class="field">
+                {{ form_label(reg_form.plainPassword.second) }}
+                {{ form_widget(reg_form.plainPassword.second, {attr: {
+                    id: 'reg-pass-confirm',
+                    autocomplete: 'new-password',
                     'aria-invalid': reg_form.plainPassword.vars.errors|length > 0 ? 'true' : 'false'
                 }}) }}
                 {% for error in reg_form.plainPassword.vars.errors %}