diff --git a/templates/Froxlor/login/fpwd.html.twig b/templates/Froxlor/login/fpwd.html.twig
index 26f7246d..19908097 100644
--- a/templates/Froxlor/login/fpwd.html.twig
+++ b/templates/Froxlor/login/fpwd.html.twig
@@ -28,7 +28,7 @@
 
 						<div class="mb-3">
 							<label for="loginname" class="col-form-label">{{ lng('login.username') }}</label>
-							<input class="form-control" type="text" name="loginname" id="loginname" value="" required/>
+							<input class="form-control" type="text" name="loginname" id="loginname" value="" required autofocus/>
 						</div>
 
 						<div class="mb-3">
diff --git a/templates/Froxlor/login/login.html.twig b/templates/Froxlor/login/login.html.twig
index 14921f9d..5d093b42 100644
--- a/templates/Froxlor/login/login.html.twig
+++ b/templates/Froxlor/login/login.html.twig
@@ -29,7 +29,7 @@
 
 						<div class="mb-3">
 							<label for="loginname" class="col-form-label">{{ lng('login.username') }}</label>
-							<input class="form-control" type="text" name="loginname" id="loginname" value="" required/>
+							<input class="form-control" type="text" name="loginname" id="loginname" value="" required autofocus/>
 						</div>
 
 						<div class="mb-3">
diff --git a/templates/Froxlor/login/rpwd.html.twig b/templates/Froxlor/login/rpwd.html.twig
index 7ca573e0..f35597b3 100644
--- a/templates/Froxlor/login/rpwd.html.twig
+++ b/templates/Froxlor/login/rpwd.html.twig
@@ -20,7 +20,7 @@
 
 						<div class="mb-3">
 							<label for="new_password" class="col-form-label">{{ lng('changepassword.new_password') }}</label>
-							<input class="form-control" type="password" name="new_password" id="new_password" value="" required/>
+							<input class="form-control" type="password" name="new_password" id="new_password" value="" required autofocus/>
 						</div>
 
 						<div class="mb-3">