diff --git a/app/app/components/settings/user-list.js b/app/app/components/settings/user-list.js
index f87bc847..32bc4a25 100644
--- a/app/app/components/settings/user-list.js
+++ b/app/app/components/settings/user-list.js
@@ -112,7 +112,6 @@ export default Ember.Component.extend({
 		save() {
 			let user = this.get('editUser');
 			let password = this.get('password');
-			debugger;
 
 			if (is.empty(user.firstname)) {
 				$("#edit-firstname").addClass("error").focus();
diff --git a/app/app/models/page-meta.js b/app/app/models/page-meta.js
index 593b41a9..d584d70b 100644
--- a/app/app/models/page-meta.js
+++ b/app/app/models/page-meta.js
@@ -11,13 +11,13 @@
 
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
-// import { belongsTo, hasMany } from 'ember-data/relationships';
+// import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
 	pageId: attr('string'),
 	documentId: attr('string'),
 	orgId: attr('string'),
-	rawBody: attr('string'),
+	rawBody: attr(),
 	config: attr(),
 	externalSource: attr('boolean', { defaultValue: false }),
 	created: attr(),
diff --git a/app/app/models/page.js b/app/app/models/page.js
index bf7a5b4b..586991b4 100644
--- a/app/app/models/page.js
+++ b/app/app/models/page.js
@@ -12,7 +12,7 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import Ember from 'ember';
-// import { belongsTo, hasMany } from 'ember-data/relationships';
+// import { hasMany } from 'ember-data/relationships';
 
 export default Model.extend({
 	documentId: attr('string'),
@@ -25,6 +25,7 @@ export default Model.extend({
 	body: attr('string'),
 	rawBody: attr('string'),
 	meta: attr(),
+	// meta: hasMany('page-meta'),
 
 	tagName: Ember.computed('level', function () {
 		return "h" + this.get('level');
diff --git a/app/app/pods/document/edit/controller.js b/app/app/pods/document/edit/controller.js
index 8d95b6f3..91a2f2b0 100644
--- a/app/app/pods/document/edit/controller.js
+++ b/app/app/pods/document/edit/controller.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -29,8 +29,8 @@ export default Ember.Controller.extend(NotifierMixin, {
 			this.showNotification("Saving");
 
 			let model = {
-				page: page,
-				meta: meta
+				page: page.toJSON({ includeId: true }),
+				meta: meta.toJSON({ includeId: true })
 			};
 
 			this.get('documentService').updatePage(page.get('documentId'), page.get('id'), model).then(function () {
@@ -43,4 +43,4 @@ export default Ember.Controller.extend(NotifierMixin, {
 			});
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/app/app/services/document.js b/app/app/services/document.js
index b5b52c15..de3f093a 100644
--- a/app/app/services/document.js
+++ b/app/app/services/document.js
@@ -124,6 +124,7 @@ export default Ember.Service.extend({
 	updatePage: function (documentId, pageId, payload, skipRevision) {
 		var revision = skipRevision ? "?r=true" : "?r=false";
 		let url = `documents/${documentId}/pages/${pageId}${revision}`;
+		Ember.set(payload.meta, 'id', parseInt(payload.meta.id));
 
 		return this.get('ajax').request(url, {
 			method: 'PUT',