diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
index 0f0a265630d596ef42b4a62abd06299579509255..1a7277df8732d70958292b02d43a62a26beefa55 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
@@ -55,10 +55,7 @@
 # Updates relation of an ERP5 document\n
 from Products.ERP5Type.Message import Message\n
 from Products.Formulator.Errors import ValidationError\n
-\n
-# XXX: Harcoded value, which must be taken from RelationField.py\n
-# XXX why not import it then ???\n
-SUB_FIELD_ID = \'relation\'\n
+from Products.ERP5Form.MultiRelationField import SUB_FIELD_ID\n
 \n
 if listbox_uid is not None:\n
   selection_tool = context.getPortalObject().portal_selections\n
@@ -79,7 +76,7 @@ else:\n
   # XXX Not very dynamic...\n
   sub_field_key = field.generate_subfield_key(SUB_FIELD_ID, key=field_key)\n
   old_request[sub_field_key] = uids\n
-\n
+  old_request[field_key] = uids\n
 \n
 request = container.REQUEST\n
 request_form = request.form\n
@@ -143,6 +140,7 @@ return edit_method(form_id,\n
                             <string>Message</string>
                             <string>Products.Formulator.Errors</string>
                             <string>ValidationError</string>
+                            <string>Products.ERP5Form.MultiRelationField</string>
                             <string>SUB_FIELD_ID</string>
                             <string>None</string>
                             <string>_getattr_</string>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 3455529f50eb096476797319684787264d0c6f03..b970b95db359d4685b9d5647726c7778e9fecfa4 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-40817
\ No newline at end of file
+40818
\ No newline at end of file