diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index 9cb837f2e..00c895543 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -781,6 +781,26 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact(Timeout = TestTimeout)]
+        public async Task CanImportMnemonic()
+        {
+            using (var s = SeleniumTester.Create())
+            {
+                await s.StartAsync();
+                s.RegisterNewUser(true);
+                foreach (var isHotwallet in new[] { false, true })
+                {
+                    var (storeName, storeId) = s.CreateNewStore();
+                    s.GenerateWallet(privkeys: isHotwallet, seed: "melody lizard phrase voice unique car opinion merge degree evil swift cargo");
+                    s.GoToWallet(s.WalletId, WalletsNavPages.Settings);
+                    if (isHotwallet)
+                        Assert.Contains("View seed", s.Driver.PageSource);
+                    else
+                        Assert.DoesNotContain("View seed", s.Driver.PageSource);
+                }
+            }
+        }
+
         [Fact(Timeout = TestTimeout)]
         public async Task CanManageWallet()
         {
diff --git a/BTCPayServer/Controllers/StoresController.Onchain.cs b/BTCPayServer/Controllers/StoresController.Onchain.cs
index d09280a32..53e33e2e8 100644
--- a/BTCPayServer/Controllers/StoresController.Onchain.cs
+++ b/BTCPayServer/Controllers/StoresController.Onchain.cs
@@ -163,7 +163,7 @@ namespace BTCPayServer.Controllers
                     store.SetSupportedPaymentMethod(paymentMethodId, strategy);
                     storeBlob.SetExcluded(paymentMethodId, false);
                     storeBlob.Hints.Wallet = false;
-                    storeBlob.PayJoinEnabled = vm.IsHotWallet && vm.SetupRequest.PayJoinEnabled;
+                    storeBlob.PayJoinEnabled = strategy.IsHotWallet && !(vm.SetupRequest?.PayJoinEnabled is false);
                     store.SetStoreBlob(storeBlob);
                 }
                 catch
diff --git a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml b/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
index bc8d5d938..620bb8d78 100644
--- a/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
+++ b/BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
@@ -49,7 +49,6 @@
 <form method="post" asp-controller="Stores" asp-action="UpdateWallet" asp-route-storeId="@Model.StoreId" asp-route-cryptoCode="@Model.CryptoCode">
     <input asp-for="Config" type="hidden"/>
     <input asp-for="Confirmation" type="hidden"/>
-    <input asp-for="DerivationScheme" type="hidden"/>
     <input asp-for="AccountKey" type="hidden" />
     <input asp-for="RootFingerprint" type="hidden" />
     <input asp-for="KeyPath" type="hidden" />