diff --git a/BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml b/BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml
index 01a446205..703965ee6 100644
--- a/BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml
+++ b/BTCPayServer/Views/UIAccount/LoginWith2fa.cshtml
@@ -7,16 +7,13 @@
         <input asp-for="RememberMe" type="hidden"/>
         <div class="form-group">
             <label asp-for="TwoFactorCode" class="form-label"></label>
-            <input asp-for="TwoFactorCode" class="form-control" autocomplete="off" autofocus style="width:13em"/>
+            <input asp-for="TwoFactorCode" class="form-control" autocomplete="off" autofocus style="width:14ch"/>
             <span asp-validation-for="TwoFactorCode" class="text-danger"></span>
         </div>
-        <div class="form-group">
-            <div class="checkbox">
-                <label asp-for="RememberMachine" class="form-label">
-                    <input asp-for="RememberMachine"/>
-                    @Html.DisplayNameFor(m => m.RememberMachine)
-                </label>
-            </div>
+        <div class="form-check mb-3">
+            <input asp-for="RememberMachine" type="checkbox" class="form-check-input" />
+            <label asp-for="RememberMachine" class="form-check-label"></label>
+            <span asp-validation-for="RememberMachine" class="text-danger"></span>
         </div>
         <div class="form-group">
             <button type="submit" class="btn btn-primary">Log in</button>
diff --git a/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml b/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
index 01fc6d7b0..aef658649 100644
--- a/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
+++ b/BTCPayServer/Views/UIManage/EnableAuthenticator.cshtml
@@ -42,7 +42,7 @@
                 <input asp-for="SharedKey" type="hidden" />
                 <div class="form-group">
                     <label asp-for="Code" class="form-label">Verification Code</label>
-                    <input asp-for="Code" class="form-control" autocomplete="off" />
+                    <input asp-for="Code" class="form-control" autocomplete="off" autofocus style="width:14ch"/>
                     <span asp-validation-for="Code" class="text-danger"></span>
                 </div>
                 <button type="submit" class="btn btn-primary mt-2">Verify</button>