diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index 5799cc769..5a9425e2c 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -126,7 +126,6 @@ namespace BTCPayServer.Tests
             Driver.FindElement(By.Id($"Modify{cryptoCode}")).ForceClick();
             Driver.FindElement(By.Id("import-from-btn")).ForceClick();
             Driver.FindElement(By.Id("nbxplorergeneratewalletbtn")).ForceClick();
-            Thread.Sleep(200); // allow for modal to fade in
             Driver.WaitForElement(By.Id("ExistingMnemonic")).SendKeys(seed);
             SetCheckbox(Driver.FindElement(By.Id("SavePrivateKeys")), privkeys);
             SetCheckbox(Driver.FindElement(By.Id("ImportKeysToRPC")), importkeys);
diff --git a/BTCPayServer/Controllers/StoresController.BTCLike.cs b/BTCPayServer/Controllers/StoresController.BTCLike.cs
index 1926cecb1..8b33bd5bf 100644
--- a/BTCPayServer/Controllers/StoresController.BTCLike.cs
+++ b/BTCPayServer/Controllers/StoresController.BTCLike.cs
@@ -22,6 +22,8 @@ using NBXplorer.DerivationStrategy;
 using NBXplorer.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer.Controllers
 {
@@ -328,11 +330,15 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> GenerateNBXWallet(string storeId, string cryptoCode,
             GenerateWalletRequest request)
         {
+            Logs.Events.LogInformation($"GenerateNBXWallet called {storeId}, {cryptoCode}, {request.ToJson()}");
+
             if (!await CanUseHotWallet())
             {
                 return NotFound();
             }
-            
+
+            Logs.Events.LogInformation($"GenerateNBXWallet after CanUseHotWallet");
+
             var network = _NetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
             var client = _ExplorerProvider.GetExplorerClient(cryptoCode);
             var response = await client.GenerateWalletAsync(request);
@@ -345,6 +351,9 @@ namespace BTCPayServer.Controllers
                 });
                 return RedirectToAction("AddDerivationScheme", new {storeId, cryptoCode});
             }
+
+            Logs.Events.LogInformation($"GenerateNBXWallet after GenerateWalletAsync");
+
             var store = HttpContext.GetStoreData();
             var result = await AddDerivationScheme(storeId,
                 new DerivationSchemeViewModel()
@@ -362,7 +371,7 @@ namespace BTCPayServer.Controllers
                     Enabled = !store.GetStoreBlob()
                         .IsExcluded(new PaymentMethodId(cryptoCode, PaymentTypes.BTCLike))
                 }, cryptoCode);
-            
+
             TempData.SetStatusMessageModel(new StatusMessageModel()
             {
                 Severity = StatusMessageModel.StatusSeverity.Success,
@@ -370,6 +379,8 @@ namespace BTCPayServer.Controllers
                     ? "Your wallet has been imported."
                     : $"Your wallet has been generated. Please store your seed securely! <br/><code>{response.Mnemonic}</code>"
             });
+
+            Logs.Events.LogInformation($"GenerateNBXWallet returning success result");
             return result;
         }