diff --git a/index.html b/index.html
index a2ef8ef..0bd726c 100644
--- a/index.html
+++ b/index.html
@@ -313,7 +313,7 @@
             style="display: none"
           >
             <span
-              onclick="this.parentElement.style.display='block'"
+              onclick="this.parentElement.style.display='none'"
               class="w3-button w3-display-topright"
               >&times;</span
             >
diff --git a/js/9.9.9/scripts.js b/js/9.9.9/scripts.js
index e6ff6a7..c8aeebd 100644
--- a/js/9.9.9/scripts.js
+++ b/js/9.9.9/scripts.js
@@ -47,20 +47,11 @@ function setPassword() {
   let pw = sanitize(x.elements[0].value);
 
   if (pw != "" || pw !== "undefined") {
-    let pwOld = pw;
     passwordHash.set(sha256(pw));
-    let templateFiles = retrieveData("templateFiles");
-    if (templateFiles == null) {
-      let wrongPWAlert = document.getElementById("wrongPWAlert");
-      wrongPWAlert.style.display = "block";
-      wrongPWAlert.addEventListener("click", (e) => {
-        if (e.target && e.target.tagName === "A") {
-          clearStorage();
-          document.getElementById("wrongPWAlert").innerHTML = 
-            "<p>all files cleared - set new password</p>";
-        }
-      });
-      passwordHash.set(pwOld);
+    let tF = retrieveData("templateFiles");
+    if (tF == null) {
+      wrongPwAlert();
+      passwordHash.set("");
       x.elements[0].value = "";
       return;
     }
@@ -68,7 +59,7 @@ function setPassword() {
 
     //make sure to bring back persistent stat after logout
     activeState.settings.persistentStorage = "true";
-    let tF = retrieveData("templateFiles");
+    tF = retrieveData("templateFiles");
     if (tF == null || tF.length == 0) {
       activeState.settings.persistentStorage = "false";
     }
@@ -78,6 +69,18 @@ function setPassword() {
   }
 }
 
+function wrongPwAlert() {
+  let wrongPWAlert = document.getElementById("wrongPWAlert");
+  wrongPWAlert.style.display = "block";
+  wrongPWAlert.addEventListener("click", (e) => {
+    if (e.target && e.target.tagName === "A") {
+      clearStorage();
+      document.getElementById("wrongPWAlert").innerHTML = 
+        "<p>all files cleared - set new password</p>";
+    }
+  });
+}
+
 function cyrb53(str, seed = 21) {
   let h1 = 0xdeadbeef ^ seed,
     h2 = 0x41c6ce57 ^ seed;
diff --git a/js/9.9.9/settings.js b/js/9.9.9/settings.js
index 5691cc9..7d32db7 100644
--- a/js/9.9.9/settings.js
+++ b/js/9.9.9/settings.js
@@ -196,10 +196,8 @@ function saveSettings() {
         //transfer tF
         if (tF != null) storeData("templateFiles", tF);
 
-        if (setting[1] == "false") {
-          let msg = (activeState.settings.persistentStorage == "false") ? "temporary" : "persistent";
-          printVersion("storage mode: "+msg+" |");
-        }
+        let msg = (activeState.settings.persistentStorage == "false") ? "temporary" : "persistent";
+        printVersion("storage mode: "+msg+" |");
 
       }
     }
diff --git a/js/9.9.9/storage.js b/js/9.9.9/storage.js
index 7ca5259..43ac4b2 100644
--- a/js/9.9.9/storage.js
+++ b/js/9.9.9/storage.js
@@ -3,9 +3,9 @@ import sha256 from "./sha256.min.js";
 import { getCurrentDate, passwordHash, sanitize } from "./scripts.js";
 
 const store = {
-  getItem: function (key) {return getStor().getItem(key)},
-  setItem: function (key, data) {getStor().setItem(key, data)},
-  removeItem: function (key) {getStor().removeItem(key)},
+  getItem: function (key) {return getStor().getItem(sha256(key+activeState.userId))},
+  setItem: function (key, data) {getStor().setItem(sha256(key+activeState.userId), data)},
+  removeItem: function (key) {getStor().removeItem(sha256(key+activeState.userId))},
   clear: function () {getStor().clear()},
 };
 
@@ -79,7 +79,7 @@ function storeData(name, data, ref) {
   let lT = activeState.loadedTemplate;
   let key = sha256(name + "_m21_" + lT);
   if (name == "templateFiles") {
-    key = sha256(name + "_m21_");
+    key = sha256(name + "_m21_" + activeState.userId);
   }
   store.setItem(key, obfuscate(data));
 }
@@ -105,7 +105,7 @@ function retrieveData(name, template = "none") {
     let lT = activeState.loadedTemplate;
     key = sha256(name + "_m21_" + lT);
     if (name == "templateFiles") {
-      key = sha256(name + "_m21_");
+      key = sha256(name + "_m21_"+activeState.userId);
     }
   } else {
     key = sha256(name + "_m21_" + template);
@@ -133,15 +133,12 @@ function clearData(name, template = "none") {
     lT = activeState.loadedTemplate;
     key = sha256(name + "_m21_" + lT);
     if (name == "templateFiles") {
-      key = sha256(name + "_m21_");
+      key = sha256(name + "_m21_"+activeState.userId);
     }
   } else {
     lT = template;
     key = sha256(name + "_m21_" + template);
   }
-  if (name == "templateFiles") {
-    key = sha256(name + "_m21_");
-  }
   store.removeItem(key);
 }
 
@@ -249,7 +246,7 @@ function importBookShelf() {
           });
         }
         store.setItem(
-          sha256("templateFiles-"),
+          sha256("templateFiles_m21_"+activeState.userId),
           obfuscate(JSON.stringify(templateFilesArray))
         );
       }
@@ -264,7 +261,7 @@ function importBookShelf() {
 }
 
 function storeSettings(data, get = false) {
-  let key = sha256("settings_m21_");
+  let key = sha256("settings_m21_"+activeState.userId);
 
   if (get) {
     let cdata = "";