diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.js b/lnbits/extensions/watchonly/static/components/payment/payment.js
index 4e63a8a2..e2b5d488 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.js
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.js
@@ -14,11 +14,9 @@ async function payment(path) {
     watch: {
       immediate: true,
       accounts() {
-        console.log('### watch accounts', newVal)
         this.updateChangeAddress()
       },
-      addresses(newVal) {
-        console.log('### watch addresses', newVal)
+      addresses() {
         this.updateChangeAddress()
       }
     },
@@ -144,12 +142,11 @@ async function payment(path) {
           // change account deleted
           if (!changeAccount) {
             this.changeWallet = this.accounts[0]
-            this.selectChangeAddress(this.changeWallet)
           }
         } else {
           this.changeWallet = this.accounts[0]
-          this.selectChangeAddress(this.changeWallet)
         }
+        this.selectChangeAddress(this.changeWallet)
       },
       getTotalPaymentAmount: function () {
         return this.sendToList.reduce((t, a) => t + (a.amount || 0), 0)
diff --git a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
index 3fdeb1b8..64e48578 100644
--- a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
+++ b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
@@ -102,17 +102,18 @@ async function utxoList(path) {
         return total
       },
       applyUtxoSelectionMode: function () {
+        const isSelectAll = mode === 'Select All'
+        if (isSelectAll) {
+          this.utxos.data.forEach(u => (u.selected = true))
+          return
+        }
+
         const payedAmount = this['payed-amount']
         const mode = this.payment.utxoSelectionMode
         this.utxos.data.forEach(u => (u.selected = false))
         const isManual = mode === 'Manual'
         if (isManual || !payedAmount) return
 
-        const isSelectAll = mode === 'Select All'
-        if (isSelectAll || payedAmount >= this.utxos.total) {
-          this.utxos.data.forEach(u => (u.selected = true))
-          return
-        }
         const isSmallerFirst = mode === 'Smaller Inputs First'
         const isLargerFirst = mode === 'Larger Inputs First'
 
diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html
index 8bd7502d..01fa4b11 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/index.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/index.html
@@ -27,7 +27,7 @@
             class="btn-full"
             color="secondary"
             @click="scanAllAddresses"
-            :disabled="scan.scanning == true"
+            :disabled="scan.scanning == true || showPayment"
             >Scan Blockchain</q-btn
           >
         </div>