diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index ebb6850..c4955de 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -20,13 +20,25 @@
                         <label for="username" class="block leading-6 text-gray-900">
                             E-Mail:
                         </label>
-                        <input type="text" id="username" name="_username" value="{{ last_username }}" class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6">
+                        <input type="email"
+                               id="username"
+                               name="_username"
+                               value="{{ last_username }}"
+                               class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
+                               required
+                               autofocus
+                               autocomplete="username">
                     </div>
                     <div class="mb-6">
                         <label for="password" class="block leading-6 text-gray-900">
                             Passwort:
                         </label>
-                        <input type="password" id="password" name="_password" class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6">
+                        <input type="password"
+                               id="password"
+                               name="_password"
+                               class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
+                               required
+                               autocomplete="current-password">
                     </div>
                     <button type="submit" class="btn w-full">
                         Login