diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 2340d7586..fe4728c07 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.54</Version>
+		<Version>1.0.1.55</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index 4461e9037..03cb339a4 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -110,15 +110,15 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpGet]
-        [Route("{storeId}/wallet")]
-        public async Task<IActionResult> Wallet(string storeId)
+        [Route("{storeId}/wallet/{cryptoCode}")]
+        public async Task<IActionResult> Wallet(string storeId, string cryptoCode)
         {
             var store = await _Repo.FindStore(storeId, GetUserId());
             if (store == null)
                 return NotFound();
             WalletModel model = new WalletModel();
             model.ServerUrl = GetStoreUrl(storeId);
-            model.SetCryptoCurrencies(_ExplorerProvider, store.GetDefaultCrypto());
+            model.CryptoCurrency = cryptoCode;
             return View(model);
         }
 
diff --git a/BTCPayServer/Hosting/Startup.cs b/BTCPayServer/Hosting/Startup.cs
index afa361675..6409d1b5f 100644
--- a/BTCPayServer/Hosting/Startup.cs
+++ b/BTCPayServer/Hosting/Startup.cs
@@ -94,13 +94,13 @@ namespace BTCPayServer.Hosting
             });
 
             // Needed to debug U2F for ledger support
-            //services.Configure<KestrelServerOptions>(kestrel =>
-            //{
-            //    kestrel.Listen(IPAddress.Loopback, 5012, l =>
-            //    {
-            //        l.UseHttps("devtest.pfx", "toto");
-            //    });
-            //});
+            services.Configure<KestrelServerOptions>(kestrel =>
+            {
+                kestrel.Listen(IPAddress.Loopback, 5012, l =>
+                {
+                    l.UseHttps("devtest.pfx", "toto");
+                });
+            });
         }
 
         // Big hack, tests fails if only call AddHangfire because Hangfire fail at initializing at the second test run
diff --git a/BTCPayServer/Models/StoreViewModels/WalletModel.cs b/BTCPayServer/Models/StoreViewModels/WalletModel.cs
index 5869e7f90..8038c8429 100644
--- a/BTCPayServer/Models/StoreViewModels/WalletModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/WalletModel.cs
@@ -10,25 +10,10 @@ namespace BTCPayServer.Models.StoreViewModels
     public class WalletModel
     {
         public string ServerUrl { get; set; }
-        public SelectList CryptoCurrencies { get; set; }
-        [Display(Name = "Crypto currency")]
         public string CryptoCurrency
         {
             get;
             set;
         }
-
-        class Format
-        {
-            public string Name { get; set; }
-            public string Value { get; set; }
-        }
-        public void SetCryptoCurrencies(ExplorerClientProvider explorerProvider, string selectedScheme)
-        {
-            var choices = explorerProvider.GetAll().Select(o => new Format() { Name = o.Item1.CryptoCode, Value = o.Item1.CryptoCode }).ToArray();
-            var chosen = choices.FirstOrDefault(f => f.Name == selectedScheme) ?? choices.FirstOrDefault();
-            CryptoCurrencies = new SelectList(choices, nameof(chosen.Value), nameof(chosen.Name), chosen);
-            CryptoCurrency = chosen.Name;
-        }
     }
 }
diff --git a/BTCPayServer/Views/Stores/StoreNavPages.cs b/BTCPayServer/Views/Stores/StoreNavPages.cs
index 3e816e16f..91fd277e0 100644
--- a/BTCPayServer/Views/Stores/StoreNavPages.cs
+++ b/BTCPayServer/Views/Stores/StoreNavPages.cs
@@ -14,10 +14,8 @@ namespace BTCPayServer.Views.Stores
 
 
         public static string Tokens => "Tokens";
-        public static string Wallet => "Wallet";
 
         public static string TokensNavClass(ViewContext viewContext) => PageNavClass(viewContext, Tokens);
-        public static string WalletNavClass(ViewContext viewContext) => PageNavClass(viewContext, Wallet);
 
         public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index);
 
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 64ccb132c..f7da3dc7c 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -93,8 +93,14 @@
                         {
                         <tr>
                             <td>@scheme.Crypto</td>
-                            <td style="max-width:400px;overflow:hidden;">@scheme.Value</td>
-                            <td style="text-align:right"><a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto">Modify</a></td>
+                            <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
+                            <td style="text-align:right">
+                                @if(!string.IsNullOrWhiteSpace(scheme.Value))
+                                {
+                                    <a asp-action="Wallet" asp-route-cryptoCode="@scheme.Crypto">Wallet</a><span> - </span>
+                                }
+                                <a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto">Modify</a>
+                            </td>
                         </tr>
                         }
                     </tbody>
diff --git a/BTCPayServer/Views/Stores/Wallet.cshtml b/BTCPayServer/Views/Stores/Wallet.cshtml
index 47ca5c988..3160e6250 100644
--- a/BTCPayServer/Views/Stores/Wallet.cshtml
+++ b/BTCPayServer/Views/Stores/Wallet.cshtml
@@ -2,7 +2,6 @@
 @{
     Layout = "../Shared/_NavLayout.cshtml";
     ViewData["Title"] = "Manage wallet";
-    ViewData.AddActivePage(StoreNavPages.Wallet);
 }
 
 <h4>@ViewData["Title"]</h4>
@@ -32,10 +31,7 @@
 </div>
 <div class="col-md-6">
     <form id="sendform" style="display:none;">
-        <div class="form-group">
-            <label asp-for="CryptoCurrency"></label>
-            <select id="cryptoCurrencies" asp-for="CryptoCurrency" asp-items="Model.CryptoCurrencies" class="form-control"></select>
-        </div>
+        <input type="hidden" id="cryptoCode" asp-for="CryptoCurrency" />
         <div class="form-group">
             <label>Destination</label>
             <input id="destination-textbox" name="Destination" class="form-control"  type="text" />
diff --git a/BTCPayServer/Views/Stores/_Nav.cshtml b/BTCPayServer/Views/Stores/_Nav.cshtml
index 081eb1afc..143ceec1e 100644
--- a/BTCPayServer/Views/Stores/_Nav.cshtml
+++ b/BTCPayServer/Views/Stores/_Nav.cshtml
@@ -4,6 +4,5 @@
 <ul class="nav nav-pills nav-stacked">
     <li class="@StoreNavPages.IndexNavClass(ViewContext)"><a asp-action="UpdateStore">Information</a></li>
     <li class="@StoreNavPages.TokensNavClass(ViewContext)"><a asp-action="ListTokens">Access Tokens</a></li>
-    <li class="@StoreNavPages.WalletNavClass(ViewContext)"><a asp-action="Wallet">Wallet</a></li>
 </ul>
 
diff --git a/BTCPayServer/wwwroot/js/StoreWallet.js b/BTCPayServer/wwwroot/js/StoreWallet.js
index dbd370d22..454e57904 100644
--- a/BTCPayServer/wwwroot/js/StoreWallet.js
+++ b/BTCPayServer/wwwroot/js/StoreWallet.js
@@ -3,6 +3,7 @@
     var bridge = new ledgerwebsocket.LedgerWebSocketBridge(srvModel.serverUrl + "ws/ledger");
     var recommendedFees = "";
     var recommendedBalance = "";
+    var cryptoCode = $("#cryptoCode").val();
 
     function WriteAlert(type, message) {
         $(".alert").removeClass("alert-danger");
@@ -37,7 +38,7 @@
         }
 
         var args = "";
-        args += "cryptoCode=" + $("#cryptoCurrencies").val();
+        args += "cryptoCode=" + cryptoCode;
         args += "&destination=" + $("#destination-textbox").val();
         args += "&amount=" + $("#amount-textbox").val();
         args += "&feeRate=" + $("#fee-textbox").val();
@@ -64,6 +65,10 @@
                     WriteAlert("danger", result.error);
                 } else {
                     WriteAlert("success", 'Transaction broadcasted (' + result.transactionId + ')');
+                    $("#fee-textbox").val("");
+                    $("#amount-textbox").val("");
+                    $("#destination-textbox").val("");
+                    $("#substract-checkbox").prop("checked", false);
                     updateInfo();
                 }
             });
@@ -85,15 +90,10 @@
         return false;
     });
 
-    $("#cryptoCurrencies").on("change", function (elem) {
-        updateInfo();
-    });
-
     var updateInfo = function () {
         if (!ledgerDetected)
             return false;
         $(".crypto-info").css("display", "none");
-        var cryptoCode = $("#cryptoCurrencies").val();
         bridge.sendCommand("getinfo", "cryptoCode=" + cryptoCode)
             .catch(function (reason) { Write('check', 'error', reason); })
             .then(function (result) {