diff --git a/wire/core/Tfa.php b/wire/core/Tfa.php
index fc05cdc0..9fc49553 100644
--- a/wire/core/Tfa.php
+++ b/wire/core/Tfa.php
@@ -599,6 +599,7 @@ class Tfa extends WireData implements Module, ConfigurableModule {
 		$f->attr('name', 'tfa_code');
 		$f->label = $this->inputLabel; // Authentication code
 		$f->attr('required', 'required');
+		$f->attr('autocomplete', 'one-time-code');
 		$f->collapsed = Inputfield::collapsedNever;
 		$form->add($f);
 		
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/themes/default/admin.css b/wire/modules/AdminTheme/AdminThemeUikit/themes/default/admin.css
index 3993ed14..2e21be38 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/themes/default/admin.css
+++ b/wire/modules/AdminTheme/AdminThemeUikit/themes/default/admin.css
@@ -5105,10 +5105,20 @@ a
   ) {
 	color: inherit;
 }
-
+/*
+ * this rule is causing wrong background color to appear between fields with themeOffset>0
 html.pw .Inputfield.InputfieldTinyMCE .InputfieldContent {
 	background-color: var(--pw-blocks-background, #f4f4f4);
 }
+ */
+
+.pw .InputfieldStateCollapsed.InputfieldNoBorder:hover > .InputfieldHeader {
+	/* fixes wrong background color for collapsed Inputfield with no-border when hovered */
+	background-color: inherit;
+}
+.InputfieldFileDelete {
+	padding-right: 7px; 
+}
 
 .pw .tox-dialog .tox-button--naked {
 	border: none;