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 283a00398f5ad8820fd8ce5dd70ad20efc9fe7de..441cbc6e3686dd2efa4766c71933fda9f7c577fa 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,8 @@ portal_entity_type_list = portal.getPortalEntityTypeList()\n
 logged_in_user_value = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
 start_date = DateTime()\n
 \n
-person = source\n
 organisation = None\n
-if logged_in_user_value is not None and person is None:\n
+if logged_in_user_value is not None:\n
   person = logged_in_user_value.getRelativeUrl()\n
   organisation = logged_in_user_value.getSubordination()\n
 \n
@@ -85,15 +84,18 @@ if context.getPortalType() in portal_entity_type_list:\n
 else:\n
   follow_up = context.getRelativeUrl()\n
 \n
+# XXX if source or destination is explicitcy choosen, what should be\n
+# source_section or destination_section ???\n
+\n
 if direction == \'outgoing\':\n
-  source_url = person\n
+  source_url = source or person\n
   source_section_url = organisation\n
-  destination_url = person_relative_url or organisation_relative_url\n
+  destination_url = destination or person_relative_url or organisation_relative_url\n
   destination_section_url = organisation_relative_url\n
 elif direction == \'incoming\':\n
-  source_url = person_relative_url or organisation_relative_url\n
+  source_url = source or person_relative_url or organisation_relative_url\n
   source_section_url = organisation_relative_url\n
-  destination_url = person\n
+  destination_url = destination or person\n
   destination_section_url = organisation\n
 else:\n
   raise NotImplementedError, \'The specified direction is not handled: %r\' % (direction,)\n
@@ -139,7 +141,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, source=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, destination=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 717d11435654543ec632d90970f3daa7ff73b87e..e59f0632ab19b456e3df415e223418bb600b8ab4 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-657
+658
\ No newline at end of file