diff --git a/bip39-standalone.html b/bip39-standalone.html
index 3b4f0f2..a2a90d3 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -186,9 +186,9 @@
                                     <label class="col-sm-3 control-label" data-translate>Mnemonic Length</label>
                                     <div class="col-sm-9">
                                         <select class="mnemonic-length form-control">
-                                            <option value="raw" data-translate>From entropy length (3 words per 32 bits)</option>
+                                            <option value="raw" selected data-translate>Use Raw Entropy (3 words per 32 bits)</option>
                                             <option value="12">12 <span data-translate>Words</span></option>
-                                            <option value="15" selected>15 <span data-translate>Words</option>
+                                            <option value="15">15 <span data-translate>Words</option>
                                             <option value="18">18 <span data-translate>Words</span></option>
                                             <option value="21">21 <span data-translate>Words</span></option>
                                             <option value="24">24 <span data-translate>Words</span></option>
diff --git a/src/index.html b/src/index.html
index 964746e..3c19b60 100644
--- a/src/index.html
+++ b/src/index.html
@@ -182,9 +182,9 @@
                                     <label class="col-sm-3 control-label" data-translate>Mnemonic Length</label>
                                     <div class="col-sm-9">
                                         <select class="mnemonic-length form-control">
-                                            <option value="raw" data-translate>From entropy length (3 words per 32 bits)</option>
+                                            <option value="raw" selected data-translate>Use Raw Entropy (3 words per 32 bits)</option>
                                             <option value="12">12 <span data-translate>Words</span></option>
-                                            <option value="15" selected>15 <span data-translate>Words</option>
+                                            <option value="15">15 <span data-translate>Words</option>
                                             <option value="18">18 <span data-translate>Words</span></option>
                                             <option value="21">21 <span data-translate>Words</span></option>
                                             <option value="24">24 <span data-translate>Words</span></option>
diff --git a/tests.js b/tests.js
index a3c3f57..ace2fbb 100644
--- a/tests.js
+++ b/tests.js
@@ -2268,7 +2268,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
         $(".entropy").val("00000000 00000000 00000000 00000000").trigger("input");
     });
     // check the mnemonic is set and address is correct
@@ -2804,7 +2803,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
     });
     var nextTest = function runNextTest(i) {
         function getFeedbackError(expected, actual) {
@@ -2886,7 +2884,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
         var entropy  = "00000000 00000000 00000000 00000000";
             entropy += "11111111 11111111 11111111 1111"; // Missing last byte
         $(".entropy").val(entropy).trigger("input");
@@ -2913,7 +2910,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
         var entropy  = "";
         // Generate a very long entropy string
         for (var i=0; i<33; i++) {
@@ -2947,7 +2943,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
         var entropy  = "543210543210543210543210543210543210543210543210543210543210543210543210543210543210543210543210543";
         $(".entropy").val(entropy).trigger("input");
     });
@@ -3039,7 +3034,6 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
-        $(".mnemonic-length").val("raw");
         $(".entropy").val("7S 9H 9S QH 8C KS AS 7D 7C QD 4S 4D TC 2D 5S JS 3D 8S 8H 4C 3C AC 3S QC 9C JC 7H AD TD JD 6D KH 5C QS 2S 6S 6H JH KD 9D-6C TS TH 4H KC 5H 2H AH 2C 8D 3H 5D").trigger("input");
     });
     // get the mnemonic
@@ -3345,6 +3339,7 @@ page.open(url, function(status) {
     // use entropy
     page.evaluate(function() {
         $(".use-entropy").prop("checked", true).trigger("change");
+        $(".mnemonic-length").val("15");
         $(".entropy").val("1111").trigger("input");
     });
     waitForGenerate(function() {