diff --git a/app/js/bluecrypt-acme.js b/app/js/bluecrypt-acme.js
index 8d58e6e..4d9f0d4 100644
--- a/app/js/bluecrypt-acme.js
+++ b/app/js/bluecrypt-acme.js
@@ -2317,7 +2317,7 @@ ACME._setChallengesAll = function (me, options) {
   function setNext() {
     var authUrl = setAuths.shift();
     var claim = claims.shift();
-    if (!authUrl) { return; }
+    if (!authUrl) { return Promise.resolve(); }
 
     // var domain = options.domains[i]; // claim.identifier.value
 
@@ -2390,7 +2390,7 @@ ACME._finalizeOrder = function (me, options) {
           if (me.debug) { console.debug('[acme-v2.js] pollCert:'); }
           return ACME._jwsRequest(me, {
             options: options
-          , url: options.order.finalize
+          , url: options.order.finalizeUrl
           , protected: { kid: options._kid }
           , payload: Enc.binToBuf(payload)
           }).then(function (resp) {
diff --git a/app/js/greenlock.js b/app/js/greenlock.js
index 944b1cd..dafc748 100644
--- a/app/js/greenlock.js
+++ b/app/js/greenlock.js
@@ -444,7 +444,7 @@
   steps[4].submit = function () {
     console.log('Congrats! Auto advancing...');
 
-    window.alert("An error happened in the final step, but it's not your fault. Email aj@rootprojects.org and let him know.");
+    steps[i]();
   };
 
   steps[5] = function () {