diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index dd8bd6fea..1e7c2b51f 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -485,8 +485,6 @@ namespace BTCPayServer.Tests
                     }
                 }
                 SignWith(mnemonic);
-                var accountKey = root.Derive(new KeyPath("m/84'/1'/0'")).GetWif(Network.RegTest).ToString();
-                SignWith(accountKey);
             }
         }
     }
diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs
index 97eb0ee19..aacc170e8 100644
--- a/BTCPayServer/Controllers/WalletsController.cs
+++ b/BTCPayServer/Controllers/WalletsController.cs
@@ -584,28 +584,41 @@ namespace BTCPayServer.Controllers
                 signingKeySettings.RootFingerprint = extKey.GetPublicKey().GetHDFingerPrint();
 
             RootedKeyPath rootedKeyPath = signingKeySettings.GetRootedKeyPath();
+            if (rootedKeyPath == null)
+            {
+                ModelState.AddModelError(nameof(viewModel.SeedOrKey), "The master fingerprint and/or account key path of your seed are not set in the wallet settings.");
+                return View(viewModel);
+            }
             // The user gave the root key, let's try to rebase the PSBT, and derive the account private key
-            if (rootedKeyPath?.MasterFingerprint == extKey.GetPublicKey().GetHDFingerPrint())
+            if (rootedKeyPath.MasterFingerprint == extKey.GetPublicKey().GetHDFingerPrint())
             {
                 psbt.RebaseKeyPaths(signingKeySettings.AccountKey, rootedKeyPath);
                 signingKey = extKey.Derive(rootedKeyPath.KeyPath);
             }
-            // The user maybe gave the account key, let's try to sign with it
             else
             {
-                signingKey = extKey;
-            }
-            var balanceChange = psbt.GetBalance(settings.AccountDerivation, signingKey, rootedKeyPath);
-            if (balanceChange == Money.Zero)
-            {
-                ModelState.AddModelError(nameof(viewModel.SeedOrKey), "This seed is unable to sign this transaction. Either the seed is incorrect, or the account path has not been properly configured in the Wallet Settings.");
+                ModelState.AddModelError(nameof(viewModel.SeedOrKey), "The master fingerprint does not match the one set in your wallet settings. Probable cause are: wrong seed, wrong passphrase or wrong fingerprint in your wallet settings.");
+                return View(viewModel);
+            }
+
+            var changed = PSBTChanged(psbt, () => psbt.SignAll(settings.AccountDerivation, signingKey, rootedKeyPath));
+            if (!changed)
+            {
+                ModelState.AddModelError(nameof(viewModel.SeedOrKey), "Impossible to sign the transaction. Probable cause: Incorrect account key path in wallet settings, PSBT already signed.");
                 return View(viewModel);
             }
-            psbt.SignAll(settings.AccountDerivation, signingKey, rootedKeyPath);
             ModelState.Remove(nameof(viewModel.PSBT));
             return await WalletPSBTReady(walletId, psbt.ToBase64(), signingKey.GetWif(network.NBitcoinNetwork).ToString(), rootedKeyPath?.ToString());
         }
 
+        private bool PSBTChanged(PSBT psbt, Action act)
+        {
+            var before = psbt.ToBase64();
+            act();
+            var after = psbt.ToBase64();
+            return before != after;
+        }
+
         private string ValueToString(Money v, BTCPayNetworkBase network)
         {
             return v.ToString() + " " + network.CryptoCode;