diff --git a/calendar/src/mixins/PropertyMixin.js b/calendar/src/mixins/PropertyMixin.js
index ab50da8..ca05572 100644
--- a/calendar/src/mixins/PropertyMixin.js
+++ b/calendar/src/mixins/PropertyMixin.js
@@ -37,6 +37,7 @@ import MapMarker from 'vue-material-design-icons/MapMarker.vue'
 import Tag from 'vue-material-design-icons/Tag.vue'
 import TextBoxOutline from 'vue-material-design-icons/TextBoxOutline.vue'
 import Bell from 'vue-material-design-icons/Bell.vue'
+import Human from 'vue-material-design-icons/Human.vue'
 
 export default {
 	components: {
@@ -48,6 +49,7 @@ export default {
 		Tag,
 		TextBoxOutline,
 		Bell,
+		Human
 	},
 	props: {
 		/**
diff --git a/calendar/src/models/calendarObject.js b/calendar/src/models/calendarObject.js
index 7113df8..4e80758 100644
--- a/calendar/src/models/calendarObject.js
+++ b/calendar/src/models/calendarObject.js
@@ -134,7 +134,6 @@ const setCustomKeyValueToIcsAndReturnIcs = (ics, key,value) => {
 }
 
 const setCustomKeyValuesArrayToIcsAndReturnIcs = (ics, keyValueArray) => {
-	debugger
 	for (var key in keyValueArray) {
 		const value = keyValueArray[key] ? keyValueArray[key] : '';
 		ics = setCustomKeyValueToIcsAndReturnIcs(ics, key, value);
diff --git a/calendar/src/models/event.js b/calendar/src/models/event.js
index 2fead22..0f57320 100644
--- a/calendar/src/models/event.js
+++ b/calendar/src/models/event.js
@@ -106,8 +106,8 @@ const mapEventComponentToEventObject = (eventComponent) => {
 		isAllDay: eventComponent.isAllDay(),
 		canModifyAllDay: eventComponent.canModifyAllDay(),
 		location: eventComponent.location,
-		client : eventComponent.client,
-		embalmer : eventComponent.embalmer,
+		client : "CLIENT",
+		embalmer : "TEST",
 		description: eventComponent.description,
 		accessClass: eventComponent.accessClass,
 		status: eventComponent.status,
@@ -193,7 +193,15 @@ const mapEventComponentToEventObject = (eventComponent) => {
 		}
 	}
 
-	return eventObject
+	if(eventComponent.hasProperty('CLIENT')){
+		eventObject.client = eventComponent.getFirstPropertyFirstValue('CLIENT');
+	}
+
+	if(eventComponent.hasProperty('EMBALMER')){
+		eventObject.embalmer = eventComponent.getFirstPropertyFirstValue('EMBALMER');
+	}
+
+	return eventObject;
 }
 
 /**
diff --git a/calendar/src/models/rfcProps.js b/calendar/src/models/rfcProps.js
index 855330d..d3b4e5f 100644
--- a/calendar/src/models/rfcProps.js
+++ b/calendar/src/models/rfcProps.js
@@ -127,7 +127,7 @@ const getRFCProperties = () => {
 
 		clients: {
 			readableName: t('calendar', 'Clients'),
-			icon: 'Tag',
+			icon: 'Human',
 			searchable: true,
 			multiple: false,
 			info: t('calendar', 'Client from Gestion'),
@@ -139,12 +139,12 @@ const getRFCProperties = () => {
 		client: {
 			readableName: t('calendar', 'client'),
 			placeholder: t('calendar', 'Add a client'),
-			icon: 'User',
+			icon: 'Human',
 		},
 
 		embalmers: {
 			readableName: t('calendar', 'Embalmers'),
-			icon: 'User',
+			icon: 'Human',
 			searchable: true,
 			multiple: false,
 			info: t('calendar', 'Thanatopracteur from Gestion'),
@@ -156,7 +156,7 @@ const getRFCProperties = () => {
 		embalmer: {
 			readableName: t('calendar', 'Embalmer'),
 			placeholder: t('calendar', 'Add a thanatopracteur'),
-			icon: 'MapMarker',
+			icon: 'Human',
 		},
 
 		articles: {
diff --git a/calendar/src/store/calendarObjectInstance.js b/calendar/src/store/calendarObjectInstance.js
index 4c9330a..c3992df 100644
--- a/calendar/src/store/calendarObjectInstance.js
+++ b/calendar/src/store/calendarObjectInstance.js
@@ -1684,7 +1684,6 @@ const actions = {
 	async saveCalendarObjectInstance({ state, dispatch, commit }, { thisAndAllFuture, calendarId }) {
 		const eventComponent = state.calendarObjectInstance.eventComponent
 		const calendarObject = state.calendarObject
-		debugger
 
 		updateAlarms(eventComponent)
 		updateTalkParticipants(eventComponent)
diff --git a/calendar/src/store/calendarObjects.js b/calendar/src/store/calendarObjects.js
index 2d0e043..70b12cb 100644
--- a/calendar/src/store/calendarObjects.js
+++ b/calendar/src/store/calendarObjects.js
@@ -224,7 +224,6 @@ const actions = {
 	 * @return {Promise<void>}
 	 */
 	async updateCalendarObject(context, { calendarObject }) {
-		debugger
 		let eventComponent = calendarObject.calendarComponent.getFirstComponent('VEVENT');
 		if (calendarObject.existsOnServer) {
 			calendarObject.dav.data = calendarObject.calendarComponent.toICS()