diff --git a/BTCPayServer/Controllers/VaultController.cs b/BTCPayServer/Controllers/VaultController.cs
index 7a75550b9..c21d7c938 100644
--- a/BTCPayServer/Controllers/VaultController.cs
+++ b/BTCPayServer/Controllers/VaultController.cs
@@ -198,7 +198,7 @@ namespace BTCPayServer.Controllers
                                 {
                                     continue;
                                 }
-
+                                await websocketHelper.Send("{ \"info\": \"ok\"}", cancellationToken);
                                 var askedXpub = JObject.Parse(await websocketHelper.NextMessageAsync(cancellationToken));
                                 var addressType = askedXpub["addressType"].Value<string>();
                                 var accountNumber = askedXpub["accountNumber"].Value<int>();
diff --git a/BTCPayServer/wwwroot/js/vaultbridge.ui.js b/BTCPayServer/wwwroot/js/vaultbridge.ui.js
index 53d66788e..620c253a3 100644
--- a/BTCPayServer/wwwroot/js/vaultbridge.ui.js
+++ b/BTCPayServer/wwwroot/js/vaultbridge.ui.js
@@ -174,10 +174,16 @@ var vaultui = (function () {
             if (!await self.ensureConnectedToBackend())
                 return false;
             self.bridge.socket.send("ask-xpub");
+            var json = await self.bridge.waitBackendMessage();
+            if (json.hasOwnProperty("error")) {
+                if (await needRetry(json))
+                    return await self.askForXPubs();
+                return false;
+            }
             var selectedXPubs = await self.getXpubSettings();
             self.bridge.socket.send(JSON.stringify(selectedXPubs));
             show(VaultFeedbacks.fetchingXpubs);
-            var json = await self.bridge.waitBackendMessage();
+            json = await self.bridge.waitBackendMessage();
             if (json.hasOwnProperty("error")) {
                 if (await needRetry(json))
                     return await self.askForXPubs();
@@ -251,7 +257,8 @@ var vaultui = (function () {
             $("#vault-confirm").css("display", "block");
             $("#vault-confirm").text("Confirm the passphrase");
             return new Promise(function (resolve, reject) {
-                $("#vault-confirm").click(async function () {
+                $("#vault-confirm").click(async function (e) {
+                    e.preventDefault();
                     var passphrase = $("#Password").val();
                     if (passphrase !== $("#PasswordConfirmation").val()) {
                         show(VaultFeedbacks.invalidPasswordConfirmation);