diff --git a/src/index.html b/src/index.html
index feefbd8..beda577 100644
--- a/src/index.html
+++ b/src/index.html
@@ -137,7 +137,7 @@
                                     <label class="col-sm-2 control-label">Mnemonic Length</label>
                                     <div class="col-sm-10">
                                         <select class="mnemonic-length form-control">
-                                            <option value="raw">From entropy length</option>
+                                            <option value="raw">From entropy length (3 words per 32 bits)</option>
                                             <option value="12">12 Words</option>
                                             <option value="15">15 Words</option>
                                             <option value="18">18 Words</option>
diff --git a/src/js/index.js b/src/js/index.js
index 45f378d..66585a9 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -68,6 +68,7 @@
         DOM.network.on("change", networkChanged);
         DOM.useEntropy.on("change", setEntropyVisibility);
         DOM.entropy.on("input", delayedEntropyChanged);
+        DOM.entropyMnemonicLength.on("change", entropyChanged);
         DOM.phrase.on("input", delayedPhraseChanged);
         DOM.passphrase.on("input", delayedPhraseChanged);
         DOM.generate.on("click", generateClicked);
@@ -744,9 +745,25 @@
         }
         // Show entropy details
         showEntropyFeedback(entropy);
+        // Use entropy hash if not using raw entropy
+        var bits = entropy.binaryStr;
+        var mnemonicLength = DOM.entropyMnemonicLength.val();
+        if (mnemonicLength != "raw") {
+            // Get bits by hashing entropy with SHA256
+            var hash = sjcl.hash.sha256.hash(entropy.cleanStr);
+            var hex = sjcl.codec.hex.fromBits(hash);
+            bits = BigInteger.parse(hex, 16).toString(2);
+            for (var i=0; i<256-bits.length; i++) {
+                bits = "0" + bits;
+            }
+            // Truncate hash to suit number of words
+            mnemonicLength = parseInt(mnemonicLength);
+            var numberOfBits = 32 * mnemonicLength / 3;
+            bits = bits.substring(0, numberOfBits);
+        }
         // Discard trailing entropy
-        var bitsToUse = Math.floor(entropy.binaryStr.length / 32) * 32;
-        var binaryStr = entropy.binaryStr.substring(0, bitsToUse);
+        var bitsToUse = Math.floor(bits.length / 32) * 32;
+        var binaryStr = bits.substring(0, bitsToUse);
         // Convert entropy string to numeric array
         var entropyArr = [];
         for (var i=0; i<binaryStr.length / 8; i++) {
diff --git a/tests.js b/tests.js
index 420873d..37a758f 100644
--- a/tests.js
+++ b/tests.js
@@ -2774,6 +2774,31 @@ page.open(url, function(status) {
 });
 },
 
+// Mnemonic length can be selected even for weak entropy
+function() {
+page.open(url, function(status) {
+    // use entropy
+    page.evaluate(function() {
+        $(".use-entropy").prop("checked", true).trigger("change");
+        $(".entropy").val("012345");
+        $(".mnemonic-length").val("18").trigger("change");
+    });
+    // check the mnemonic is the correct length
+    waitForGenerate(function() {
+        var phrase = page.evaluate(function() {
+            return $(".phrase").val();
+        });
+        var numberOfWords = phrase.split(/\s/g).length;
+        if (numberOfWords != 18) {
+            console.log("Weak entropy cannot be overridden to give 18 word mnemonic");
+            console.log(phrase);
+            fail();
+        }
+        next();
+    });
+});
+},
+
 // If you wish to add more tests, do so here...
 
 // Here is a blank test template