diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index d4e4c61e5..e78f8fb3a 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -17,7 +17,7 @@
 					+ '<span class="fontastic">⏱</span>'
 					+ '<input name="totp_code" type="text" class="input-block-level"'
 					+ ' pattern="[0-9]*" inputmode="numeric"'
-					+ ' autocomplete="off" autocorrect="off" autocapitalize="none"'
+					+ ' autocomplete="one-time-code" autocorrect="off" autocapitalize="none"'
 					+ ' data-bind="textInput: totp, disable: submitRequest" data-i18n="[placeholder]'+placeholder
 					+ '" placeholder="'+rl.i18n(placeholder)+'">'
 				+ '</div>'));
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 418b2e6fe..6c081d8ce 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -21,7 +21,7 @@
 	<div class="controls">
 		<span class="fontastic">⏱</span>
 		<input name="TOTP" type="text" pattern="[0-9]*" inputmode="numeric" class="input-block-level"
-			autocomplete="off" autocorrect="off" autocapitalize="off"
+			autocomplete="one-time-code" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: totp, disable: submitRequest"
 			data-i18n="[placeholder]LOGIN/LABEL_TOTP">
 	</div>