diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index f905973b4..d8ce69da2 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -203,7 +203,7 @@ namespace BTCPayServer.Controllers
 
         [HttpPost]
         [Route("{storeId}/derivations")]
-        public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string command, string selectedScheme = null)
+        public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string selectedScheme = null)
         {
             selectedScheme = selectedScheme ?? "BTC";
             var store = await _Repo.FindStore(storeId, GetUserId());
@@ -224,16 +224,31 @@ namespace BTCPayServer.Controllers
                 return View(vm);
             }
 
-            if (command == "Save")
+
+            DerivationStrategyBase strategy = null;
+            try
+            {
+                if (!string.IsNullOrEmpty(vm.DerivationScheme))
+                {
+                    strategy = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
+                    vm.DerivationScheme = strategy.ToString();
+                }
+                store.SetDerivationStrategy(network, vm.DerivationScheme);
+            }
+            catch
+            {
+                ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                vm.Confirmation = false;
+                return View(vm);
+            }
+
+
+            if (strategy == null || vm.Confirmation)
             {
                 try
                 {
-                    if (!string.IsNullOrEmpty(vm.DerivationScheme))
-                    {
-                        var strategy = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
+                    if (strategy != null)
                         await wallet.TrackAsync(strategy);
-                        vm.DerivationScheme = strategy.ToString();
-                    }
                     store.SetDerivationStrategy(network, vm.DerivationScheme);
                 }
                 catch
@@ -250,22 +265,15 @@ namespace BTCPayServer.Controllers
             {
                 if (!string.IsNullOrEmpty(vm.DerivationScheme))
                 {
-                    try
-                    {
-                        var scheme = ParseDerivationStrategy(vm.DerivationScheme, vm.DerivationSchemeFormat, network);
-                        var line = scheme.GetLineFor(DerivationFeature.Deposit);
+                    var line = strategy.GetLineFor(DerivationFeature.Deposit);
 
-                        for (int i = 0; i < 10; i++)
-                        {
-                            var address = line.Derive((uint)i);
-                            vm.AddressSamples.Add((DerivationStrategyBase.GetKeyPath(DerivationFeature.Deposit).Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork).ToString()));
-                        }
-                    }
-                    catch
+                    for (int i = 0; i < 10; i++)
                     {
-                        ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid Derivation Scheme");
+                        var address = line.Derive((uint)i);
+                        vm.AddressSamples.Add((DerivationStrategyBase.GetKeyPath(DerivationFeature.Deposit).Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork).ToString()));
                     }
                 }
+                vm.Confirmation = true;
                 return View(vm);
             }
         }
diff --git a/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs b/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
index ca7f5334a..ed54c8abc 100644
--- a/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
@@ -48,6 +48,8 @@ namespace BTCPayServer.Models.StoreViewModels
             set;
         }
 
+        public bool Confirmation { get; set; }
+
         public SelectList CryptoCurrencies { get; set; }
         public SelectList DerivationSchemeFormats { get; set; }
 
diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index 6b8e22979..6f3dfe2f6 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -15,29 +15,26 @@
 <div class="row">
     <div class="col-md-6">
         <form method="post">
-            <div class="form-group">
-                <h5>Derivation Scheme</h5>
-                @if(Model.AddressSamples.Count == 0)
-        {
+            @if(!Model.Confirmation)
+    {
+        <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>
-            <div class="form-group">
-                <label asp-for="CryptoCurrency"></label>
-                <select asp-for="CryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
-            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="CryptoCurrency"></label>
+            <select asp-for="CryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
+        </div>
 
-            <div class="form-group">
-                <input asp-for="DerivationScheme" class="form-control" />
-                <span asp-validation-for="DerivationScheme" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="DerivationSchemeFormat"></label>
-                <select asp-for="DerivationSchemeFormat" asp-items="Model.DerivationSchemeFormats" class="form-control"></select>
-            </div>
-            <div class="form-group">
-                @if(Model.AddressSamples.Count == 0)
-        {
+        <div class="form-group">
+            <input asp-for="DerivationScheme" class="form-control" />
+            <span asp-validation-for="DerivationScheme" class="text-danger"></span>
+        </div>
+        <div class="form-group">
+            <label asp-for="DerivationSchemeFormat"></label>
+            <select asp-for="DerivationSchemeFormat" asp-items="Model.DerivationSchemeFormats" class="form-control"></select>
+        </div>
+        <div class="form-group">
             <span>BTCPay format memo</span>
             <table class="table">
                 <thead class="thead-inverse">
@@ -73,30 +70,39 @@
                     </tr>
                 </tbody>
             </table>
+        </div>
+        <button name="command" type="submit" class="btn btn-info">Continue</button>
 }
 else
 {
-        <table class="table">
-            <thead class="thead-inverse">
+        <div class="form-group">
+            <h5>Confirm the addresses (@Model.CryptoCurrency)</h5>
+            <span>Please check that your @Model.CryptoCurrency wallet is generating the same addresses as below.</span>
+        </div>
+        <input type="hidden" asp-for="CryptoCurrency" />
+        <input type="hidden" asp-for="Confirmation" />
+        <input type="hidden" asp-for="DerivationScheme" />
+        <div class="form-group">
+            <table class="table">
+                <thead class="thead-inverse">
+                    <tr>
+                        <th>Key path</th>
+                        <th>Address</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach(var sample in Model.AddressSamples)
+            {
                 <tr>
-                    <th>Key path</th>
-                    <th>Address</th>
+                    <td>@sample.KeyPath</td>
+                    <td>@sample.Address</td>
                 </tr>
-            </thead>
-            <tbody>
-                @foreach(var sample in Model.AddressSamples)
-        {
-            <tr>
-                <td>@sample.KeyPath</td>
-                <td>@sample.Address</td>
-            </tr>
+    }
+                </tbody>
+            </table>
+        </div>
+        <button name="command" type="submit" class="btn btn-success">Confirm</button>
 }
-            </tbody>
-        </table>
-}
-            </div>
-            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
-            <button name="command" type="submit" class="btn btn-default" value="Check">Check ExtPubKey</button>
         </form>
     </div>
 </div>