diff --git a/templates/auth/login.html.tera b/templates/auth/login.html.tera
index a099df4..02fbdca 100644
--- a/templates/auth/login.html.tera
+++ b/templates/auth/login.html.tera
@@ -15,9 +15,9 @@
       <div class="-space-y-px rounded-md shadow-sm">
         <div>
 	  {% if name %}
-          	{{ macros::input(label='Name', name='name', type='input', required=true, class='rounded-t-md',hide_label=true,value=name) }}
+          	{{ macros::input(label='Name', name='name', type='input', required=true, class='rounded-t-md',hide_label=true,value=name, autofocus=true) }}
 	  {% else %}
-          	{{ macros::input(label='Name', name='name', type='input', required=true, class='rounded-t-md',hide_label=true) }}
+          	{{ macros::input(label='Name', name='name', type='input', required=true, class='rounded-t-md',hide_label=true, autofocus=true) }}
 
 	  {% endif %}
         </div>
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index d82c00a..f2a9a67 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -38,10 +38,10 @@
     <div class="h-8"></div>
 {% endmacro header %}
 
-{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='') %}
+{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false) %}
 <div>
   <label for="{{ name }}" class="{% if hide_label %} sr-only {% else %} small text-gray-600 {% endif %}">{{ label }}</label>
-  <input {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %} name="{{ name }}" type="{{ type }}" {% if required %} required {% endif %} value="{{ value }}" class="input {{ class }}" placeholder="{% if hide_label %}{{ label }}{% endif %}" {% if min %} min="{{ min }}" {% endif %}>
+  <input {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %} name="{{ name }}" type="{{ type }}" {% if required %} required {% endif %} value="{{ value }}" class="input {{ class }}" placeholder="{% if hide_label %}{{ label }}{% endif %}" {% if min %} min="{{ min }}" {% endif %}{% if autofocus %}autofocus {% endif %}>
 </div>
 {% endmacro input %}