diff --git a/BTCPayServer/Models/AccountViewModels/LoginViewModel.cs b/BTCPayServer/Models/AccountViewModels/LoginViewModel.cs
index 4246643b0..bdf2f105f 100644
--- a/BTCPayServer/Models/AccountViewModels/LoginViewModel.cs
+++ b/BTCPayServer/Models/AccountViewModels/LoginViewModel.cs
@@ -14,7 +14,7 @@ namespace BTCPayServer.Models.AccountViewModels
         public string Password { get; set; }
         public string LoginCode { get; set; }
 
-        [Display(Name = "Remember me?")]
+        [Display(Name = "Remember me")]
         public bool RememberMe { get; set; }
     }
 }
diff --git a/BTCPayServer/Views/UIAccount/Login.cshtml b/BTCPayServer/Views/UIAccount/Login.cshtml
index 3f2f97075..a825bc3f2 100644
--- a/BTCPayServer/Views/UIAccount/Login.cshtml
+++ b/BTCPayServer/Views/UIAccount/Login.cshtml
@@ -20,11 +20,16 @@
                 <label asp-for="Password" class="form-label"></label>
                 <a asp-action="ForgotPassword" tabindex="5">Forgot password?</a>
             </div>
-            <div class="input-group  d-flex">
+            <div class="input-group d-flex">
                 <input asp-for="Password" class="form-control" required tabindex="2"/>
             </div>
             <span asp-validation-for="Password" class="text-danger"></span>
         </div>
+        <div class="form-check">
+            <input asp-for="RememberMe" type="checkbox" class="form-check-input" />
+            <label asp-for="RememberMe" class="form-check-label"></label>
+            <span asp-validation-for="RememberMe" class="text-danger"></span>
+        </div>
         <div class="form-group mt-4">
             <div class="btn-group w-100">
                 <button type="submit" class="btn btn-primary btn-lg w-100" id="LoginButton" tabindex="3"><span class="ps-3">Sign in</span></button>