diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 47a0c18c3..655414b04 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -206,8 +206,6 @@
$(IncludeRazorContentInPack)
-
-
$(IncludeRazorContentInPack)
diff --git a/BTCPayServer/Controllers/ManageController.2FA.cs b/BTCPayServer/Controllers/ManageController.2FA.cs
index 47945f169..fdc7e9d72 100644
--- a/BTCPayServer/Controllers/ManageController.2FA.cs
+++ b/BTCPayServer/Controllers/ManageController.2FA.cs
@@ -162,23 +162,6 @@ namespace BTCPayServer.Controllers
return View(model);
}
- [HttpGet]
- public async Task GenerateRecoveryCodesWarning()
- {
- var user = await _userManager.GetUserAsync(User);
- if (user == null)
- {
- throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
- }
-
- if (!user.TwoFactorEnabled)
- {
- throw new ApplicationException($"Cannot generate recovery codes for user with ID '{user.Id}' because they do not have 2FA enabled.");
- }
-
- return View(nameof(GenerateRecoveryCodesWarning));
- }
-
private string GenerateQrCodeUri(string email, string unformattedKey)
{
return string.Format(CultureInfo.InvariantCulture,
diff --git a/BTCPayServer/Controllers/ManageController.cs b/BTCPayServer/Controllers/ManageController.cs
index 8c309e6a4..6949f5480 100644
--- a/BTCPayServer/Controllers/ManageController.cs
+++ b/BTCPayServer/Controllers/ManageController.cs
@@ -149,7 +149,7 @@ namespace BTCPayServer.Controllers
{
if (!ModelState.IsValid)
{
- return View(model);
+ return View(nameof(Index), model);
}
var user = await _userManager.GetUserAsync(User);
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml
index a36d6cad8..0a9781375 100644
--- a/BTCPayServer/Views/Server/ListUsers.cshtml
+++ b/BTCPayServer/Views/Server/ListUsers.cshtml
@@ -73,9 +73,13 @@
{
var skip = Model.Skip;
if (prevNext == -1)
+ {
skip = Math.Max(0, Model.Skip - Model.Count);
+ }
else if (prevNext == 1)
+ {
skip = Model.Skip + count;
+ }
var act = Url.Action("ListUsers", new
{
diff --git a/BTCPayServer/Views/Server/_Nav.cshtml b/BTCPayServer/Views/Server/_Nav.cshtml
index c3f59e9c6..01ce3bda8 100644
--- a/BTCPayServer/Views/Server/_Nav.cshtml
+++ b/BTCPayServer/Views/Server/_Nav.cshtml
@@ -1,10 +1,10 @@