diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index 269bc4f3..ad853b4d 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -38,7 +38,7 @@
             <?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?>
             <input type="hidden" name="relocation" value="<?php if(isset($_GET['route']) && !preg_match("/^login/", $_GET['route']) ) { if(isset($_SERVER['REDIRECT_URL'])) { print $_SERVER['REDIRECT_URL']; } else { print $_SERVER['QUERY_STRING']; } } ?>" />
 
-            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
+            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>" required autofocus>
             <input type="password" class="input-block-level" name="password" placeholder="<?php print $text_password; ?>">
 
         <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>
diff --git a/webui/view/theme/mobile/templates/login/login.tpl b/webui/view/theme/mobile/templates/login/login.tpl
index 43456f39..30581a78 100644
--- a/webui/view/theme/mobile/templates/login/login.tpl
+++ b/webui/view/theme/mobile/templates/login/login.tpl
@@ -42,7 +42,7 @@
             <?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?>
             <input type="hidden" name="relocation" value="<?php if(isset($_GET['route']) && !preg_match("/^login/", $_GET['route']) ) { if(isset($_SERVER['REDIRECT_URL'])) { print $_SERVER['REDIRECT_URL']; } else { print $_SERVER['QUERY_STRING']; } } ?>" />
 
-            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
+            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>" required autofocus>
             <input type="password" class="input-block-level bold" name="password" placeholder="<?php print $text_password; ?>">
 
          <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>