diff --git a/BTCPayServer/Controllers/StoresController.BTCLike.cs b/BTCPayServer/Controllers/StoresController.BTCLike.cs
index 5aed76201..cc4d6e59f 100644
--- a/BTCPayServer/Controllers/StoresController.BTCLike.cs
+++ b/BTCPayServer/Controllers/StoresController.BTCLike.cs
@@ -341,6 +341,7 @@ namespace BTCPayServer.Controllers
                 }
             }
             vm.Confirmation = true;
+            ModelState.Remove(nameof(vm.Config)); // Remove the cached value
             return View(vm);
         }
     }
diff --git a/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs b/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
index e176c691e..298792339 100644
--- a/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
@@ -39,6 +39,7 @@ namespace BTCPayServer.Models.StoreViewModels
         public IFormFile ColdcardPublicFile{ get; set; }
         public string Config { get; set; }
         public string Source { get; set; }
+        public string DerivationSchemeFormat { get; set; }
         public string AccountKey { get; set; }
         public BTCPayNetwork Network { get; set; }
     }
diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index eb6e48cb9..026b1b8fb 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -4,9 +4,16 @@
     ViewData.SetActivePageAndTitle(StoreNavPages.Index, $"{Model.CryptoCode} Derivation scheme");
 }
 
+@section HeadScripts {
+    <style type="text/css">
+        .hw-fields {
+            display: none;
+        }
+    </style>
+}
+
 <partial name="_StatusMessage" for="StatusMessage" />
 <h4>@ViewData["Title"]</h4>
-
 <div class="row">
     <div class="col-md-6">
         <div asp-validation-summary="All" class="text-danger"></div>
@@ -14,37 +21,39 @@
 </div>
 <div class="row">
     <div class="col-md-8">
-        <partial name="AddDerivationSchemes_HardwareWalletDialogs" model="@Model"/>  
-    
+        @if (!Model.Confirmation)
+        {
+            <partial name="AddDerivationSchemes_HardwareWalletDialogs" model="@Model" />
+        }
         <form method="post">
+
+            <input id="Config" asp-for="Config" type="hidden" />
+
             @if (!Model.Confirmation)
             {
+                <input id="CryptoCurrency" asp-for="CryptoCode" type="hidden" />
+                <input id="DerivationSchemeFormat" asp-for="DerivationSchemeFormat" type="hidden" />
+                <input id="AccountKey" asp-for="AccountKey" type="hidden" />
                 <div class="form-group">
                     <h5>Derivation Scheme</h5>
                     <span>The DerivationScheme represents the destination of the funds received by your invoice. It is generated by your wallet software. Please, verify that you are generating the right addresses by clicking on 'Check ExtPubKey'</span>
                 </div>
-                <input id="CryptoCurrency" asp-for="CryptoCode" type="hidden" />
-                <input id="KeyPath" asp-for="KeyPath" type="hidden" />
-                <input id="Source" asp-for="Source" type="hidden" />
-                <input id="RootFingerprint" asp-for="RootFingerprint" type="hidden" />
-                <input id="AccountKey" asp-for="AccountKey" type="hidden" />
-                <input id="Config" asp-for="Config" type="hidden" />
                 <div class="form-group">
                     <label asp-for="DerivationScheme"></label>
                     <input asp-for="DerivationScheme" class="form-control store-derivation-scheme" />
                     <span asp-validation-for="DerivationScheme" class="text-danger"></span>
-                    
+
                     <div class="dropdown mt-2 text-right">
                         <div class="btn-group">
-                        <button class="btn btn-link dropdown-toggle" type="button" id="hardwarewlletimportdropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Import from hardware device
-                        </button>
+                            <button class="btn btn-link dropdown-toggle" type="button" id="hardwarewlletimportdropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Import from hardware device
+                            </button>
                             <div class="dropdown-menu  dropdown-menu-right w-100" aria-labelledby="hardwarewlletimportdropdown">
                                 <button class="dropdown-item" type="button" data-toggle="modal" data-target="#coldcardimport">Coldcard</button>
-                                <button class="dropdown-item check-for-ledger" data-toggle="modal" data-target="#ledgerimport" type="button">Ledger</button>
+                                <button class="dropdown-item check-for-ledger" data-toggle="modal" data-target="#ledgerimport" type="button">Ledger Wallet</button>
                                 @* <button class="dropdown-item check-for-trezor" type="button" data-toggle="modal" data-target="#trezorimport">Trezor</button> *@
                             </div>
-                    </div>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group">
@@ -84,6 +93,22 @@
                         </tbody>
                     </table>
                 </div>
+
+                <div class="form-group hw-fields">
+                    <h5>Additional pairing information</h5>
+                </div>
+                <div class="form-group hw-fields">
+                    <label asp-for="Source"></label>
+                    <input asp-for="Source" class="form-control" readonly />
+                </div>
+                <div class="form-group hw-fields">
+                    <label asp-for="RootFingerprint"></label>
+                    <input asp-for="RootFingerprint" class="form-control" readonly />
+                </div>
+                <div class="form-group hw-fields">
+                    <label asp-for="KeyPath"></label>
+                    <input asp-for="KeyPath" class="form-control" readonly />
+                </div>
                 <div class="form-group">
                     <label asp-for="Enabled"></label>
                     <input asp-for="Enabled" type="checkbox" class="form-check" />
@@ -96,14 +121,9 @@
                     <h5>Confirm the addresses (@Model.CryptoCode)</h5>
                     <span>Please check that your @Model.CryptoCode wallet is generating the same addresses as below.</span>
                 </div>
-                <input type="hidden" asp-for="Confirmation" />
-                <input id="KeyPath" asp-for="KeyPath" type="hidden" />
-                <input id="Source" asp-for="Source" type="hidden" />
-                <input id="RootFingerprint" asp-for="RootFingerprint" type="hidden" />
-                <input id="AccountKey" asp-for="AccountKey" type="hidden" />
+                <input asp-for="Confirmation" type="hidden" />
                 <input type="hidden" asp-for="DerivationScheme" />
                 <input type="hidden" asp-for="Enabled" />
-                <input id="Config" asp-for="Config" type="hidden" />
                 <div class="form-group">
                     <table class="table table-sm table-responsive-md">
                         <thead>
@@ -138,15 +158,13 @@
         </form>
     </div>
 </div>
-
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")
-    <script src="~/js/ledgerwebsocket.js" type="text/javascript"   defer="defer"></script>
-    <script src="~/js/StoreAddDerivationScheme.js"   type="text/javascript" defer="defer"></script>
-
-    <script src="~/vendor/trezor/trezor.js-umd.min.js"  defer="defer"></script>
-    <script src="~/js/trezor/trezor-client.js"   type="text/javascript" defer="defer"></script>
-    <script src="~/js/trezor/trezor-add-derivation-scheme.js"   type="text/javascript" defer="defer"></script>
+    <script src="~/js/ledgerwebsocket.js" type="text/javascript" defer="defer"></script>
+    <script src="~/js/StoreAddDerivationScheme.js" type="text/javascript" defer="defer"></script>
+    <script src="~/vendor/trezor/trezor.js-umd.min.js" defer="defer"></script>
+    <script src="~/js/trezor/trezor-client.js" type="text/javascript" defer="defer"></script>
+    <script src="~/js/trezor/trezor-add-derivation-scheme.js" type="text/javascript" defer="defer"></script>
     <script>
         window.coinName = "@Model.Network.DisplayName.ToLowerInvariant()";
     </script>
diff --git a/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml b/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
index 0d3a4bf0a..68e7dbd8b 100644
--- a/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
@@ -14,7 +14,7 @@
                     Checking if a ledger wallet is connected...
                 </div>
                 <div id="ledger-validate" style="display: none;">
-                    Please validate access on your screen...
+                    Retrieving, wallet information... you may need to confirm access on your screen.
                 </div>
                 <p id="no-ledger-info" style="display: none;">
                     No ledger wallet detected. If you own one, use chrome, open the app, and refresh this page.
@@ -93,13 +93,6 @@
                 <p id="trezor-success" style="display: none;">
                     <span class="fa fa-check-circle" style="color: green;"></span> <span class="hw-label">Trezor wallet detected! Name: <kbd id="trezor-devicename"></kbd></span>
                 </p>
-                <input id="KeyPath" asp-for="KeyPath" type="hidden"/>
-                <input id="RootFingerprint" asp-for="RootFingerprint" type="hidden"/>
-                <input id="AccountKey" asp-for="AccountKey" type="hidden"/>
-
-                <input id="Source" asp-for="Source" type="hidden" value="Trezor"/>
-                <input type="hidden" asp-for="DerivationScheme"/>
-                <input type="hidden" asp-for="Enabled"/>
 
                 <div class="form-group display-when-trezor-connected" style="display: none">
 
@@ -127,7 +120,7 @@
                                 <option
                                     data-derivation-suffix="-[p2sh]"
                                     data-trezorkeypath="@Model.Network.GetRootKeyPath(DerivationType.SegwitP2SH).Derive(i, true)" 
-                                    >Account @i (<span>@Model.Network.GetRootKeyPath(DerivationType.SegwitP2SH).Derive(i, true)</span>)</option>
+                                    >Account @i (@Model.Network.GetRootKeyPath(DerivationType.SegwitP2SH).Derive(i, true))</option>
                             }
                         </select>
                     </div>
@@ -140,7 +133,7 @@
                             {
                                 <option 
                                     data-derivation-suffix=""
-                                    data-trezorkeypath="@Model.Network.GetRootKeyPath(DerivationType.Segwit).Derive(i, true)" href="#">Account @i (<span>@Model.Network.GetRootKeyPath(DerivationType.Segwit).Derive(i, true)</span>)</option>
+                                    data-trezorkeypath="@Model.Network.GetRootKeyPath(DerivationType.Segwit).Derive(i, true)" href="#">Account @i (@Model.Network.GetRootKeyPath(DerivationType.Segwit).Derive(i, true))</option>
                             }
                         </select>
                     </div>
@@ -154,7 +147,7 @@
                         {
                             <option
                                 data-derivation-suffix="-[legacy]"
-                                data-trezorkeypath="@Model.Network.GetRootKeyPath(DerivationType.Legacy).Derive(i, true)">Account @i (<span>@Model.Network.GetRootKeyPath(DerivationType.Legacy).Derive(i, true)</span>)</option>
+                                data-trezorkeypath="@Model.Network.GetRootKeyPath(DerivationType.Legacy).Derive(i, true)">Account @i (@Model.Network.GetRootKeyPath(DerivationType.Legacy).Derive(i, true))</option>
                         }
                     </select>
                 </div>
diff --git a/BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js b/BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js
index 47a474637..2cb171d93 100644
--- a/BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js
+++ b/BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js
@@ -48,13 +48,14 @@
                     return;
 
                 showFeedback("ledger-info");
-
                 $("#DerivationScheme").val(result.derivationScheme);
                 $("#RootFingerprint").val(result.rootFingerprint);
                 $("#AccountKey").val(result.extPubKey);
                 $("#Source").val(result.source);
                 $("#DerivationSchemeFormat").val("BTCPay");
                 $("#KeyPath").val(keypath);
+                $(".modal").modal('hide');
+                $(".hw-fields").show();
             })
             .catch(function (reason) { Write('check', 'error', reason); });
         return false;