diff --git a/src/api/storage.js b/src/api/storage.js
index 09e1595..13a52d6 100644
--- a/src/api/storage.js
+++ b/src/api/storage.js
@@ -98,7 +98,7 @@ function createUser(cairoId) {
 
 function getUserByCairoId(cairoId) {
   return users.findOne({ cairoId }).then((user) => {
-    console.log("FOUND vvvv",user);
+    console.log("FOUND vvvv", user);
     if (!user) return createUser(cairoId);
     return user;
   });
@@ -108,7 +108,7 @@ function uploadFile(cairoId, fileData) {
   return getUserByCairoId(cairoId).then((user) => {
     if (user.usedStorage + fileData.size > user.storage) return null;
     return users
-      .updateOne({ _id: userId }, { $inc: { usedStorage: fileData.size } })
+      .updateOne({ _id: cairoId }, { $inc: { usedStorage: fileData.size } })
       .then(() => createFile(user._id, fileData))
       .then((file) => {
         if (file == null) return null;
diff --git a/src/api/user.js b/src/api/user.js
index 5fa8d94..5ac33f6 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -44,12 +44,12 @@ function deleteFiles(cairoId, targetFiles) {
 /**
  * Returns a list of filecairoIds that the user owns
  */
-function getOwnedFiles(fileList) {
+function getOwnedFiles(cairoId, fileList) {
   var files = new Array(fileList.length);
   fileList.forEach(
     (file, i) =>
       (files[i] = new Promise((resolve, reject) =>
-        storage.getFile(userId, file).then(resolve).catch(reject)
+        storage.getFile(cairoId, file).then(resolve).catch(reject)
       ))
   );
   return Promise.all(files);
diff --git a/src/routes/stash.js b/src/routes/stash.js
index d12fc1c..89c3a0d 100644
--- a/src/routes/stash.js
+++ b/src/routes/stash.js
@@ -38,7 +38,7 @@ const authMiddleware = (req, res, next) => {
 router.use(cairoMiddleware);
 
 router.get("/files", authMiddleware, (req, res) =>
-  asUser.getOwnedFiles(req.user.owned).then((files) => {
+  asUser.getOwnedFiles(req.user._id, req.user.owned).then((files) => {
     res.status(200).json(files);
   })
 );