diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2db333c1977..c53e016c1c2 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -147,12 +147,12 @@
 		</div></nav>
 
 		<div id="sudo-login-background" class="hidden"></div>
-		<div id="sudo-login-form" class="hidden">
+		<form id="sudo-login-form" class="hidden">
 			<?php p($l->t('This action requires you to confirm your password:')); ?><br>
-			<input type="password" class="question" autocomplete="off" name="question" value=" <?php /* Hack against firefox ignoring autocomplete="off" */ ?>"
+			<input type="password" class="question" autocomplete="new-password" name="question" value=" <?php /* Hack against browsers ignoring autocomplete="off" */ ?>"
 				placeholder="<?php p($l->t('Confirm your password')); ?>" />
 			<input class="confirm icon-confirm" title="<?php p($l->t('Confirm')); ?>" value="" type="submit">
-		</div>
+		</form>
 
 		<div id="content-wrapper">
 			<div id="content" class="app-<?php p($_['appid']) ?>" role="main">