diff --git a/app/js/app.js b/app/js/app.js
index 7f98e6f..c14d7e3 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -34,9 +34,11 @@
   testEcdsaSupport().then(function () {
     console.log("supports ECDSA");
     BROWSER_SUPPORTS_ECDSA = true;
+    return true;
   }).catch(function () {
     console.log("DOES NOT supports ECDSA");
     BROWSER_SUPPORTS_ECDSA = false;
+    return false;
   });
   // TODO test RSA support
 
diff --git a/app/js/bacme.js b/app/js/bacme.js
index 56d29f6..978e166 100644
--- a/app/js/bacme.js
+++ b/app/js/bacme.js
@@ -566,7 +566,7 @@ BACME.generateKeypair = function (opts) {
   }
   var extractable = true;
   return window.crypto.subtle.generateKey(
-    { name: "ECDSA", namedCurve: "P-256" }
+    wcOpts
   , extractable
   , [ 'sign', 'verify' ]
   );