diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
index 6f4dfb8ae..ccd80bdd8 100644
--- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
+++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml
@@ -33,7 +33,10 @@
 
         @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default(long))
         {
-            <form method="post" asp-action="GetStoreMoneroLikePaymentMethod" class="mt-4" enctype="multipart/form-data">
+            <form method="post" asp-action="GetStoreMoneroLikePaymentMethod" 
+                  asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+                  asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")" 
+                  class="mt-4" enctype="multipart/form-data">
 
                 <div class="card my-2">
                     <h3 class="card-title p-2">Upload Wallet</h3>
@@ -58,7 +61,10 @@
                 </div>
             </form>
         }
-        <form method="post" asp-action="GetStoreMoneroLikePaymentMethod" class="mt-4" enctype="multipart/form-data">
+        <form method="post" asp-action="GetStoreMoneroLikePaymentMethod"
+              asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+              asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")" 
+              class="mt-4" enctype="multipart/form-data">
 
             <input type="hidden" asp-for="CryptoCode"/>
             @if (!Model.WalletFileFound || Model.Summary.WalletHeight == default(long))
@@ -100,7 +106,13 @@
             <div class="form-group">
                 <button type="submit" class="btn btn-primary" id="SaveButton">Save</button>
 
-                <a class="btn btn-secondary" asp-action="GetStoreMoneroLikePaymentMethods" asp-controller="MoneroLikeStore">Back to list</a>
+                <a class="btn btn-secondary" asp-action="GetStoreMoneroLikePaymentMethods"
+
+                   asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+                   asp-route-cryptoCode="@this.Context.GetRouteValue("cryptoCode")"
+                   asp-controller="MoneroLikeStore">
+                    Back to list
+                </a>
             </div>
         </form>
     </div>
diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
index 00e94aa09..f4919f687 100644
--- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
+++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
@@ -3,14 +3,14 @@
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";
-    
+
     ViewData.SetActivePageAndTitle(StoreNavPages.ActivePage, "Monero Settings");
-    
+
     ViewData["NavPartialName"] = "../Stores/_Nav";
 }
 
 
-<partial name="_StatusMessage" />
+<partial name="_StatusMessage"/>
 
 <div class="row">
     <div class="col-md-6">
@@ -19,40 +19,44 @@
 </div>
 <div class="row">
     <div class="col-md-8">
-            <div class="form-group">
-                <table class="table table-sm table-responsive-md">
-                    <thead>
-                        <tr>
-                            <th>Crypto</th>
-                            <th>Account Index</th>
-                            <th class="text-center">Enabled</th>
-                            <th class="text-right">Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach(var item in Model.Items)
-                        {
-                            <tr>
-                                <td>@item.CryptoCode</td>
-                                <td>@item.AccountIndex</td>
-                                <td class="text-center">
-                                    @if(item.Enabled)
-                                    {
-                                        <span class="fa fa-check"></span>
-                                    }
-                                    else
-                                    {
-                                        <span class="fa fa-times"></span>
-                                    }
-                                </td>
-                                <td class="text-right">
-                                    <a id="Modify" asp-action="GetStoreMoneroLikePaymentMethod" asp-route-cryptoCode="@item.CryptoCode">Modify</a>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
+        <div class="form-group">
+            <table class="table table-sm table-responsive-md">
+                <thead>
+                <tr>
+                    <th>Crypto</th>
+                    <th>Account Index</th>
+                    <th class="text-center">Enabled</th>
+                    <th class="text-right">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach (var item in Model.Items)
+                {
+                    <tr>
+                        <td>@item.CryptoCode</td>
+                        <td>@item.AccountIndex</td>
+                        <td class="text-center">
+                            @if (item.Enabled)
+                            {
+                                <span class="fa fa-check"></span>
+                            }
+                            else
+                            {
+                                <span class="fa fa-times"></span>
+                            }
+                        </td>
+                        <td class="text-right">
+                            <a id="Modify" asp-action="GetStoreMoneroLikePaymentMethod"
+                               asp-route-storeId="@this.Context.GetRouteValue("storeId")"
+                               asp-route-cryptoCode="@item.CryptoCode">
+                                Modify
+                            </a>
+                        </td>
+                    </tr>
+                }
+                </tbody>
+            </table>
+        </div>
     </div>
 </div>
 
diff --git a/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml b/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml
index 6e47a7af4..0739c0ecf 100644
--- a/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml
+++ b/BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml
@@ -1,4 +1,3 @@
-@using BTCPayServer.Controllers
 @using BTCPayServer.Services.Altcoins.Monero.Configuration
 @using BTCPayServer.Services.Altcoins.Monero.UI
 @inject SignInManager<ApplicationUser> SignInManager;
@@ -9,5 +8,5 @@
 }
 @if (SignInManager.IsSignedIn(User) && User.IsInRole(Roles.ServerAdmin) && MoneroLikeConfiguration.MoneroLikeConfigurationItems.Any())
 {
-    <a class="nav-link @(isMonero ? "active" : string.Empty)" asp-action="GetStoreMoneroLikePaymentMethods" asp-controller="MoneroLikeStore">Monero</a>
+    <a class="nav-link @(isMonero ? "active" : string.Empty)" asp-route-storeId="@this.Context.GetRouteValue("storeId")" asp-action="GetStoreMoneroLikePaymentMethods" asp-controller="MoneroLikeStore">Monero</a>
 }
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index c3f5663dc..fd147ad4b 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -203,7 +203,7 @@
                                         <span class="fa fa-times"></span>
                                     }
                                 </td>
-                                <td class="text-right"><a asp-action="@scheme.Action" id='Modify-@scheme.Provider'>Modify</a></td>
+                                <td class="text-right"><a asp-action="@scheme.Action" id='Modify-@scheme.Provider' asp-route-storeId="@this.Context.GetRouteValue("storeId")">Modify</a></td>
                             </tr>
                         }
                         </tbody>
@@ -227,7 +227,7 @@
                         <td>
                             Email
                         </td>
-                        <td style="text-align:right"><a asp-action="Emails" >Modify</a></td>
+                        <td style="text-align:right"><a asp-action="Emails" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Modify</a></td>
                     </tr>
                     </tbody>
                 </table>
diff --git a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
index bc7832270..260215097 100644
--- a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml
@@ -103,7 +103,8 @@
                                 >
                                     @label.Value
                                     <form 
-                                        asp-action="ModifyTransaction" 
+                                        asp-route-walletId="@this.Context.GetRouteValue("walletId")"
+                                        asp-action="ModifyTransaction"
                                         method="post" 
                                         class="removeTransactionLabelForm"
                                     >
@@ -136,7 +137,8 @@
                             <div class="dropdown" style="display:inline-block;">
                                 <span class="fa fa-tags" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
                                 <div class="dropdown-menu">
-                                    <form asp-action="ModifyTransaction" method="post">
+                                    <form asp-action="ModifyTransaction" method="post" 
+                                        asp-route-walletId="@this.Context.GetRouteValue("walletId")">
                                         <input type="hidden" name="transactionId" value="@transaction.Id" />
                                         <div class="dropdown-item input-group">
                                             <input name="addlabel" placeholder="Label name" maxlength="20" type="text" class="form-control form-control-sm" />
@@ -169,7 +171,8 @@
                                     <span class="fa fa-commenting" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
                                 }
                                 <div class="dropdown-menu">
-                                    <form asp-action="ModifyTransaction" method="post">
+                                    <form asp-action="ModifyTransaction" method="post" 
+                                        asp-route-walletId="@this.Context.GetRouteValue("walletId")">
                                         <input type="hidden" name="transactionId" value="@transaction.Id" />
                                         <textarea name="addcomment" class="dropdown-item" maxlength="200" rows="2" cols="20">@transaction.Comment</textarea>
                                         <div class="dropdown-item"><button type="submit" class="btn btn-primary">Save comment</button></div>