diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index eb6fa42..6c66575 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -17,11 +17,19 @@
     <h3 class="mb-3 font-weight-normal">Please sign in</h3>
     <div class="mb-3">
         <label for="inputEmail" class="form-label">Email address</label>
-        <input name="email" type="email" class="form-control" id="inputEmail" aria-describedby="emailHelp" required autofocus>
+        {% if last_username %}
+            <input name="email" type="email" class="form-control" id="inputEmail" aria-describedby="emailHelp" value="{{ last_username }}" required>
+        {% else %}
+            <input name="email" type="email" class="form-control" id="inputEmail" aria-describedby="emailHelp" value="{{ last_username }}" autofocus required>
+        {% endif %}
     </div>
     <div class="mb-3">
         <label for="inputPassword">Password</label>
-        <input type="password" name="password" id="inputPassword" class="form-control" required>
+        {% if last_username %}
+            <input type="password" name="password" id="inputPassword" class="form-control" autofocus required>
+        {% else %}
+            <input type="password" name="password" id="inputPassword" class="form-control" required>
+        {% endif %}
         <div class="mb-3">
             <a href="{{ path('app_forgot_password_request') }}">Forgot password</a>
         </div>