diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index d782e4b7..c73b5b75 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -15,6 +15,7 @@ changes since the 2.3.5 release (postfixadmin-2.3 branch)
 
   - display domain and mailbox description with correct encoding
   - fix footer link
+  - focus username input field in login form
 
 Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
diff --git a/templates/login.php b/templates/login.php
index 51971d21..5c36d76c 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -30,7 +30,7 @@
 </table>
 </form>
 
-<script tyle="text/javascript"><!--
+<script type="text/javascript"><!--
 	document.login.fUsername.focus();
 // -->
 </script>
diff --git a/templates/users_login.php b/templates/users_login.php
index 0ea67f67..58ce9a65 100644
--- a/templates/users_login.php
+++ b/templates/users_login.php
@@ -26,4 +26,9 @@
    </tr>
 </table>
 </form>
+<script type="text/javascript"><!--
+	document.login.fUsername.focus();
+// -->
+</script>
+
 </div>