diff --git a/app/app/components/settings/user-list.js b/app/app/components/settings/user-list.js
index 32bc4a25..f87bc847 100644
--- a/app/app/components/settings/user-list.js
+++ b/app/app/components/settings/user-list.js
@@ -112,6 +112,7 @@ 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/pods/folders/settings/route.js b/app/app/pods/folders/settings/route.js
index 94bd50cc..008ccf08 100644
--- a/app/app/pods/folders/settings/route.js
+++ b/app/app/pods/folders/settings/route.js
@@ -84,11 +84,13 @@ export default Ember.Route.extend(NotifierMixin, {
 				permissions.forEach((permission, index) => { /* jshint ignore:line */
 					var folderPermission = folderPermissions.findBy('userId', permission.get('userId'));
 					if (is.not.undefined(folderPermission)) {
-						Ember.set(folderPermission, 'orgId', permission.get('orgId'));
-						Ember.set(folderPermission, 'folderId', permission.get('folderId'));
-						Ember.set(folderPermission, 'canEdit', permission.get('canEdit'));
-						Ember.set(folderPermission, 'canView', permission.get('canView'));
-						Ember.set(folderPermission, 'canViewPrevious', permission.get('canView'));
+						Ember.setProperties(folderPermission, {
+							orgId: permission.get('orgId'),
+							folderId: permission.get('folderId'),
+							canEdit: permission.get('canEdit'),
+							canView: permission.get('canView'),
+							canViewPrevious: permission.get('canView')
+						});
 					}
 				});
 
diff --git a/app/app/services/document.js b/app/app/services/document.js
index b5b52c15..176db9ff 100644
--- a/app/app/services/document.js
+++ b/app/app/services/document.js
@@ -73,10 +73,12 @@ export default Ember.Service.extend({
 	// saveDocument updates an existing document record.
 	save(doc) {
 		let id = doc.get('id');
+		let data = doc.toJSON();
+		Ember.set(data, 'id', id)
 
 		return this.get('ajax').request(`documents/${id}`, {
 			method: 'PUT',
-			data: JSON.stringify(doc)
+			data: JSON.stringify(data)
 		});
 	},