diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1e6760e..e0b0c48 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 .. contents:: Table of Contents
    :depth: 2
 
+Unreleased
+==========
+
+Added
+-----
+* Add autofocus to the username input on the login page
+
+
 v0.7.2 - 2016-08-31
 ===================
 
diff --git a/cas_server/forms.py b/cas_server/forms.py
index cc6b2b0..ffa6f35 100644
--- a/cas_server/forms.py
+++ b/cas_server/forms.py
@@ -100,7 +100,10 @@ class UserCredential(BaseLogin):
          Form used on the login page to retrive user credentials
      """
     #: The user username
-    username = forms.CharField(label=_('username'))
+    username = forms.CharField(
+        label=_('username'),
+        widget=forms.TextInput(attrs={'autofocus': 'autofocus'})
+    )
     #: The user password
     password = forms.CharField(label=_('password'), widget=forms.PasswordInput)
     #: A checkbox to ask to be warn before emiting a ticket for another service