diff --git a/app/app/serializers/application.js b/app/app/serializers/application.js
index 05b576e6..beea6668 100644
--- a/app/app/serializers/application.js
+++ b/app/app/serializers/application.js
@@ -3,9 +3,11 @@ import JSONAPISerializer from 'ember-data/serializers/json-api';
 export default JSONAPISerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
-			id: resourceHash.id,
-			type: modelClass.modelName,
-			attributes: resourceHash
+			data: {
+				id: resourceHash.id,
+				type: modelClass.modelName,
+				attributes: resourceHash
+			}
 		};
 	}
 });
diff --git a/app/app/serializers/folder-permission.js b/app/app/serializers/folder-permission.js
index 72751e4d..2c2733a5 100644
--- a/app/app/serializers/folder-permission.js
+++ b/app/app/serializers/folder-permission.js
@@ -3,9 +3,11 @@ import ApplicationSerializer from './application';
 export default ApplicationSerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
-			id: resourceHash.userId ? resourceHash.userId : 'public',
-			type: modelClass.modelName,
-			attributes: resourceHash
+			data: {
+				id: resourceHash.userId ? resourceHash.userId : 0,
+				type: modelClass.modelName,
+				attributes: resourceHash
+			}
 		};
 	}
 });
diff --git a/app/app/serializers/page-meta.js b/app/app/serializers/page-meta.js
index 6372f524..811356f5 100644
--- a/app/app/serializers/page-meta.js
+++ b/app/app/serializers/page-meta.js
@@ -3,9 +3,11 @@ import ApplicationSerializer from './application';
 export default ApplicationSerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
-			id: resourceHash.id ? resourceHash.id : resourceHash.documentId,
-			type: modelClass.modelName,
-			attributes: resourceHash
+			data: {
+				id: resourceHash.id ? resourceHash.id : resourceHash.documentId,
+				type: modelClass.modelName,
+				attributes: resourceHash
+			}
 		};
 	}
 });
diff --git a/app/app/serializers/page.js b/app/app/serializers/page.js
index 6372f524..811356f5 100644
--- a/app/app/serializers/page.js
+++ b/app/app/serializers/page.js
@@ -3,9 +3,11 @@ import ApplicationSerializer from './application';
 export default ApplicationSerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
-			id: resourceHash.id ? resourceHash.id : resourceHash.documentId,
-			type: modelClass.modelName,
-			attributes: resourceHash
+			data: {
+				id: resourceHash.id ? resourceHash.id : resourceHash.documentId,
+				type: modelClass.modelName,
+				attributes: resourceHash
+			}
 		};
 	}
 });
diff --git a/app/app/serializers/user.js b/app/app/serializers/user.js
new file mode 100644
index 00000000..bdc8cff8
--- /dev/null
+++ b/app/app/serializers/user.js
@@ -0,0 +1,13 @@
+import ApplicationSerializer from './application';
+
+export default ApplicationSerializer.extend({
+	normalize(modelClass, resourceHash) {
+		return {
+			data: {
+				id: resourceHash.id ? resourceHash.id : 0,
+				type: modelClass.modelName,
+				attributes: resourceHash
+			}
+		};
+	}
+});