diff --git a/web/html/login.php b/web/html/login.php
index 94da559e..f898a578 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -29,7 +29,7 @@ html_header('AUR ' . __("Login"));
 			<?php endif; ?>
 			<p>
 				<label for="id_username"><?= __('Username') . ':'; ?></label>
-				<input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" />
+				<input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" />
 			</p>
 			<p>
 				<label for="id_password"><?= __('Password') . ':'; ?></label>
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index b4b88bd3..683675b1 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -71,7 +71,7 @@ $per_page = array(50, 100, 250);
 		</div>
 		<div>
 			<label for="id_q"><?= __("Keywords"); ?></label>
-			<input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' />
+			<input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' autofocus="autofocus" />
 		</div>
 		<div>
 			<label for="id_out_of_date"><?= __('Out of Date'); ?></label>