diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index c01add22f4..c0e1e20947 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -791,3 +791,7 @@ function delReport(t, url) {
 		}
 	);
 }
+
+for (const el of document.getElementsByClassName('autofocus')) {
+	el.focus()
+}
diff --git a/files/assets/js/login_2fa.js b/files/assets/js/login_2fa.js
deleted file mode 100644
index 53e4370aad..0000000000
--- a/files/assets/js/login_2fa.js
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('2fa_token').focus();
diff --git a/files/templates/login/forgot_password.html b/files/templates/login/forgot_password.html
index 8c55b0134e..8698032a73 100644
--- a/files/templates/login/forgot_password.html
+++ b/files/templates/login/forgot_password.html
@@ -5,7 +5,7 @@
 {% block content %}
 	<div id="login-form">
 		<form action="/forgot" method="post" class="mt-3">
-			<label for="username" class="mt-3">Username</label>
+			<label for="username" class="autofocus mt-3">Username</label>
 			<input autocomplete="off" class="form-control" id="username" type="text" name="username" required>
 			<label for="email" class="mt-3">Email</label>
 			<input type="email" autocomplete="off" class="form-control" id="password" name="email" required>
diff --git a/files/templates/login/login.html b/files/templates/login/login.html
index c175feae10..f459ac8106 100644
--- a/files/templates/login/login.html
+++ b/files/templates/login/login.html
@@ -14,7 +14,7 @@
 		{%- endset -%}
 		{% if failed %}{{macros.alert(error_text, true)}}{% endif %}
 		<form action="/login" method="post" class="mt-md-3" id="login">
-			<label for="username" class="mt-3">Username or Email Address</label>
+			<label for="username" class="autofocus mt-3">Username or Email Address</label>
 			<input autocomplete="off" class="form-control" id="username"
 			type="text" name="username" required>
 			<input hidden name="redirect" value="{{redirect}}">
diff --git a/files/templates/login/login_2fa.html b/files/templates/login/login_2fa.html
index a8f1bdc27c..df40f7d8ea 100644
--- a/files/templates/login/login_2fa.html
+++ b/files/templates/login/login_2fa.html
@@ -15,10 +15,9 @@
 		<input hidden name="redirect" value="{{redirect}}">
 		<input hidden name="time" value="{{time}}">
 		<input hidden name="hash" value="{{hash}}">
-		<label for="2fa_token" class="mt-3">Your verification code</label>
+		<label for="2fa_token" class="autofocus mt-3">Your verification code</label>
 		<input autocomplete="off" class="form-control" id="2fa_token" name="2fa_token" type="number" pattern="[0-9]" inputmode="numeric" placeholder="6-digit code">
 		<small><a href="/lost_2fa">Lost your two-factor authentication device?</a></small>
 		<button type="submit" class="btn btn-primary login w-100 mt-3" id="login_button">Sign in</button>
 	</form>
-	<script defer src="{{'js/login_2fa.js' | asset}}"></script>
 {% endblock %}
diff --git a/files/templates/login/lost_2fa.html b/files/templates/login/lost_2fa.html
index 75f0f32907..9cb75f1b95 100644
--- a/files/templates/login/lost_2fa.html
+++ b/files/templates/login/lost_2fa.html
@@ -5,7 +5,7 @@
 {% block content %}
 	<div id="login-form">
 		<form action="/lost_2fa" method="post" class="mt-3">
-			<label for="username" class="mt-3">Username</label>
+			<label for="username" class="autofocus mt-3">Username</label>
 			<input autocomplete="off" class="form-control" id="username" type="text" name="username" required{% if v %} value="{{v.username}}" disabled{% endif %}>
 			<label for="email" class="mt-3">Password</label>
 			<input autocomplete="off" class="form-control" id="password" type="password" name="password" required>
diff --git a/files/templates/login/reset_password.html b/files/templates/login/reset_password.html
index 8e1debfd50..a2445a22b1 100644
--- a/files/templates/login/reset_password.html
+++ b/files/templates/login/reset_password.html
@@ -7,7 +7,7 @@
 			<input hidden name="time" value="{{time}}">
 			<input hidden name="user_id" value="{{v.id}}">
 			<input hidden name="token" value="{{token}}">
-			<label for="passentry" class="mt-3">New Password</label>
+			<label for="passentry" class="autofocus mt-3">New Password</label>
 			<input autocomplete="off" class="form-control" id="passentry" type="password" minlength="8" maxlength="100" name="password" required>
 			<label for="confentry" class="mt-3">Confirm New Password</label>
 			<input autocomplete="off" class="form-control" id="confentry" type="password" minlength="8" maxlength="100" name="confirm_password" required>
diff --git a/files/templates/login/sign_up.html b/files/templates/login/sign_up.html
index 9c3a343fa7..b0c8d12ddb 100644
--- a/files/templates/login/sign_up.html
+++ b/files/templates/login/sign_up.html
@@ -67,7 +67,7 @@
 		{% if redirect %}<input hidden name="redirect" value="{{redirect}}">{% endif %}
 		{% if ref_user %}<input hidden name="referred_by" value="{{ref_user.id}}">{% endif %}
 
-		<label for="username-register" class="mt-3">Username</label>
+		<label for="username-register" class="autofocus mt-3">Username</label>
 
 		<input autocomplete="off" class="form-control" id="username-register" type="text" name="username" pattern="[a-zA-Z0-9_\-]{3,25}" min="3" max="25" required {% if username %}value="{{username}}"{% endif %}>
 		<small id="usernameHelpRegister"></small>