diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
index 150f2362931a1e9d511fc19905d7c1288d3e28f5..283a00398f5ad8820fd8ce5dd70ad20efc9fe7de 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.xml
@@ -67,9 +67,9 @@ portal_entity_type_list = portal.getPortalEntityTypeList()\n
 logged_in_user_value = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
 start_date = DateTime()\n
 \n
-person = None\n
+person = source\n
 organisation = None\n
-if logged_in_user_value is not None:\n
+if logged_in_user_value is not None and person is None:\n
   person = logged_in_user_value.getRelativeUrl()\n
   organisation = logged_in_user_value.getSubordination()\n
 \n
@@ -139,7 +139,7 @@ event.Base_redirect(keep_items={\'portal_status_message\': message})\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>title, direction, portal_type, resource, text_content=None, notification_message=None, batch_mode=False, keep_draft=False, follow_up=None, **kw</string> </value>
+            <value> <string>title, direction, portal_type, resource, text_content=None, notification_message=None, batch_mode=False, keep_draft=False, follow_up=None, source=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
index ade5b183b56788f45124fd02da0b9bcf8a81efac..c9c1a5e0c297c2ecb814cb038ed9179eac070d2f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_createEventFromDefaultEventPath.xml
@@ -78,10 +78,8 @@ event = context.Base_addEvent(title=\'\',\n
   notification_message=resource_reference,\n
   keep_draft=keep_draft,\n
   follow_up=follow_up,\n
+  source=source,\n
   batch_mode=True)\n
-\n
-if event.getSource() is None:\n
-  event.setSource(source)\n
 </string> </value>
         </item>
         <item>