1 files changed, 3 insertions, 1 deletions

diff --git a/src/js/index.js b/src/js/index.js
index 3a5a0ef..d9d5db3 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -532,7 +532,9 @@
             return "No root key";
         }
         // Check no hardened derivation path when using xpub keys
-        var hardened = path.indexOf("'") > -1;
+        var hardenedPath = path.indexOf("'") > -1;
+        var hardenedAddresses = bip32TabSelected() && DOM.hardenedAddresses.prop("checked");
+        var hardened = hardenedPath || hardenedAddresses;
         var isXpubkey = bip32RootKey.isNeutered();
         if (hardened && isXpubkey) {
             return "Hardened derivation path is invalid with xpub key";