diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
index d23458e99d7..6f61f1f3d95 100644
--- a/templates/user/auth/twofa.tmpl
+++ b/templates/user/auth/twofa.tmpl
@@ -11,7 +11,7 @@
 					{{template "base/alert" .}}
 					<div class="required inline field">
 						<label for="passcode">{{.i18n.Tr "passcode"}}</label>
-						<input id="passcode" name="passcode" type="text" autocomplete="off" required>
+						<input id="passcode" name="passcode" type="text" autocomplete="off" autofocus required>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 9b50285bf3f..78aab3e5756 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -11,7 +11,7 @@
 					{{template "base/alert" .}}
 					<div class="required inline field">
 						<label for="token">{{.i18n.Tr "auth.scratch_code"}}</label>
-						<input id="token" name="token" type="text" autocomplete="off" required>
+						<input id="token" name="token" type="text" autocomplete="off" autofocus required>
 					</div>
 
 					<div class="inline field">