diff --git a/src/worker/async-store.js b/src/worker/async-store.js
index 5808ecc24..f6674fe75 100644
--- a/src/worker/async-store.js
+++ b/src/worker/async-store.js
@@ -2779,7 +2779,7 @@ const factory = (Sortify, UserObject, ProxyManager,
         const start = (clientId, data, cb) => {
             // Don't create a drive if the user only wants to
             // open an existing pad
-            const noDrive = data.neverDrive || (data.noDrive && !data.userHash && !data.anonHash);
+            let noDrive = data.neverDrive || (data.noDrive && !data.userHash && !data.anonHash);
             if (noDrive) {
                 if (data.neverDrive) { store.neverCache = true; }
                 return void onNoDrive(clientId, obj => {
diff --git a/www/form/main.js b/www/form/main.js
index 4cf26335c..123ba797c 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -9,7 +9,8 @@ define([
     '/common/dom-ready.js',
     '/common/common-hash.js',
     '/common/sframe-common-outer.js',
-], function (nThen, ApiConfig, DomReady, Hash, SFCommonO) {
+    '/common/outer/local-store.js'
+], function (nThen, ApiConfig, DomReady, Hash, SFCommonO, LocalStore) {
 
     var href, hash;
     // Loaded in load #2
@@ -68,7 +69,7 @@ define([
             addData: addData,
             addRpc: addRpc,
             //cache: true,
-            noDrive: parsed?.hashData?.mode !== "view",
+            noDrive: (parsed?.hashData?.mode !== "view" || !LocalStore.isLoggedIn()),
             hash: hash,
             href: href,
             useCreationScreen: true,