diff --git a/lib/storage/moderator.js b/lib/storage/moderator.js
index 6ae0b214e..5040a0bbf 100644
--- a/lib/storage/moderator.js
+++ b/lib/storage/moderator.js
@@ -14,6 +14,7 @@ const Moderator = module.exports;
 */
 
 const pathFromId = function (Env, id) {
+    id = Util.escapeKeyCharacters(id || '');
     if (!Basic.isValidId(id)) {
         return void console.error('MODERATOR_BAD_ID', id);
     }
diff --git a/lib/storage/user.js b/lib/storage/user.js
index 659541d54..67c3399a9 100644
--- a/lib/storage/user.js
+++ b/lib/storage/user.js
@@ -14,6 +14,8 @@ const User = module.exports;
 */
 
 const pathFromId = function (Env, id) {
+    if (!id || typeof(id) !== 'string') { return; }
+    id = Util.escapeKeyCharacters(id);
     if (!Basic.isValidId(id)) {
         return void console.error('USER_BAD_ID', id);
     }