diff --git a/app/app/services/session.js b/app/app/services/session.js
index 00b4c878..5194923e 100644
--- a/app/app/services/session.js
+++ b/app/app/services/session.js
@@ -22,6 +22,7 @@ const {
 export default SimpleAuthSession.extend({
 	ajax: service(),
 	appMeta: service(),
+	store: service(),
 
 	isMac: false,
 	isMobile: false,
@@ -37,10 +38,11 @@ export default SimpleAuthSession.extend({
 	user: computed('isAuthenticated', 'session.content.authenticated.user', function () {
 		if (this.get('isAuthenticated')) {
 			let user = this.get('session.content.authenticated.user') || { id: '' };
-			return models.UserModel.create(user);
+			let data = this.get('store').normalize('user', user);
+			return this.get('store').push({ data: data });
 		}
 	}),
 
 	folderPermissions: null,
 	currentFolder: null
-});
\ No newline at end of file
+});