diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index 3c5ca14d..6f4b8d48 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -462,7 +462,10 @@ async function serialSigner(path) {
       },
       hwwXpub: async function (path) {
         try {
-          console.log('### hwwXpub', COMMAND_XPUB + ' ' + this.network + ' ' + path)
+          console.log(
+            '### hwwXpub',
+            COMMAND_XPUB + ' ' + this.network + ' ' + path
+          )
           await this.writer.write(
             COMMAND_XPUB + ' ' + this.network + ' ' + path + '\n'
           )
diff --git a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
index a573a8e8..ccd6f678 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
+++ b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
@@ -215,12 +215,14 @@
           <q-btn
             unelevated
             color="primary"
+            label="Add Watch-Only Account"
             :disable="
                 (formDialog.data.masterpub == null && accountPath == null)||
-                formDialog.data.title == null"
+                formDialog.data.title == null || showCreating"
             type="submit"
-            >Add Watch-Only Account</q-btn
           >
+          </q-btn>
+          <q-spinner v-if="showCreating" color="primary" size="2em"></q-spinner>
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
diff --git a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
index 84bf0db9..a91ff672 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
+++ b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
@@ -28,6 +28,7 @@ async function walletList(path) {
         },
         accountPath: '',
         filter: '',
+        showCreating: false,
         addressTypeOptions: [
           {
             label: 'Pay-to-pubkey-hash scripts (P2PKH)',
@@ -39,7 +40,7 @@ async function walletList(path) {
             label: 'Pay-to-witness-pubkey-hash scripts (P2WPKH)',
             value: 'wpkh',
             pathMainnet: "m/84'/0'/0'",
-            pathTestnet: "m/84'/1'/0'",
+            pathTestnet: "m/84'/1'/0'"
           },
           {
             label: 'Pay-to-script-hash scripts (P2SH-P2WPKH)',
@@ -103,9 +104,11 @@ async function walletList(path) {
       },
 
       addWalletAccount: async function () {
+        this.showCreating = true
         const data = _.omit(this.formDialog.data, 'wallet')
         data.network = this.network
         await this.createWalletAccount(data)
+        this.showCreating = false
       },
       createWalletAccount: async function (data) {
         try {
@@ -119,6 +122,7 @@ async function walletList(path) {
             } else {
               data.masterpub = `${outputType}([${fingerprint}/${path}]${xpub}/{0,1}/*)`
             }
+            console.log('###  data.masterpub', data.masterpub)
           }
           const response = await LNbits.api.request(
             'POST',