diff --git a/www/form/inner.js b/www/form/inner.js
index 113ebe4af..06d8b16aa 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1869,7 +1869,7 @@ define([
                 }
                 evOnChange.fire(false, true);
                 window.onbeforeunload = undefined;
-                if (!update) {
+                if (!update && content.answers.privateKey) {
                     // Add results button
                     addResultsButton(framework, content);
                 }
@@ -2711,6 +2711,9 @@ define([
                     answers = obj;
                     // If we have a non-anon answer, we can't answer anonymously later
                     if (!obj._isAnon) { APP.cantAnon = true; }
+
+                    // Add results button
+                    if (content.answers.privateKey) { addResultsButton(framework, content); }
                 }
                 checkIntegrity(false);
                 updateForm(framework, content, false, answers);
diff --git a/www/form/main.js b/www/form/main.js
index 77f4381d0..9ccac3d00 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -163,6 +163,7 @@ define([
                     var keys = Utils.secret && Utils.secret.keys;
 
                     var curvePrivate = privateKey || data.privateKey;
+                    if (!curvePrivate) { return void cb({error: 'EFORBIDDEN'}); }
                     var crypto = Utils.Crypto.Mailbox.createEncryptor({
                         curvePrivate: curvePrivate,
                         curvePublic: publicKey || data.publicKey,