diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 1ea5ce4..bcc9ba0 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -46,7 +46,7 @@
                         <span class="text-black dark:text-white cursor-pointer">
                             <span class="font-bold">
                                 {{ user.name }}
-                                {% if not user.last_access and "admin" in loggedin_user.roles and user.mail %}
+                                {% if not user.last_access and "admin" in loggedin_user.roles %}
                                     <form action="/admin/user"
                                           method="post"
                                           enctype="multipart/form-data"
@@ -73,7 +73,7 @@
                         {% if user.pw %}
                             <a class="block my-1 font-normal text-[#f43f5e] dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
                                href="/admin/user/{{ user.id }}/reset-pw"
-                               onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
+                               onclick="return confirm('Willst du wirklich das Passwort von \'{{ user.name }}\'zurücksetzen?');">Passwort zurücksetzen</a>
                         {% endif %}
                         <div class="w-full grid gap-3 mt-3">
                             <input type="hidden" name="id" value="{{ user.id }}" />