diff --git a/spec/ParseUser.spec.js b/spec/ParseUser.spec.js
index c9f25bd8..6c7ec26b 100644
--- a/spec/ParseUser.spec.js
+++ b/spec/ParseUser.spec.js
@@ -64,6 +64,22 @@ describe('Parse.User testing', () => {
     });
   });
 
+  it("user login with files", (done) => {
+    "use strict";
+
+    let file = new Parse.File("yolo.txt", [1,2,3], "text/plain");
+    file.save().then((file) => {
+      return Parse.User.signUp("asdf", "zxcv", { "file" : file });
+    }).then(() => {
+      return Parse.User.logIn("asdf", "zxcv");
+    }).then((user) => {
+      let fileAgain = user.get('file');
+      ok(fileAgain.name());
+      ok(fileAgain.url());
+      done();
+    });
+  });
+
   it("become", (done) => {
     var user = null;
     var sessionToken = null;
diff --git a/src/users.js b/src/users.js
index d769b9c5..5f0e01e7 100644
--- a/src/users.js
+++ b/src/users.js
@@ -58,6 +58,8 @@ function handleLogIn(req) {
       user.sessionToken = token;
       delete user.password;
 
+      req.config.filesController.expandFilesInObject(req.config, user);
+
       var expiresAt = new Date();
       expiresAt.setFullYear(expiresAt.getFullYear() + 1);