diff --git a/golem_activity_registration_payment/__manifest__.py b/golem_activity_registration_payment/__manifest__.py
index cfb8e4a..3261587 100644
--- a/golem_activity_registration_payment/__manifest__.py
+++ b/golem_activity_registration_payment/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM Activity Member Registration Payments',
     'summary': 'GOLEM Activities Member Registration Payments',
     'description': 'GOLEM Activities Member Registration Payments',
-    'version': '10.0.0.5.0',
+    'version': '10.0.0.6.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
index 6a08663..f2eab93 100644
--- a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
+++ b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
@@ -51,10 +51,9 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
                                 ondelete='cascade')
     member_id = fields.Many2one('golem.member', 'Member', required=True,
                                 ondelete='cascade')
-    partner_ids = fields.Many2many('res.partner', compute='_compute_partner_ids')
+    guardian_ids = fields.Many2many('res.partner', compute='_compute_guardian_ids')
     on_the_name_of = fields.Many2one('res.partner', 'On the Name of',
-                                     ondelete='cascade',
-                                     domain="[('id', '=', partner_ids[0][2])]")
+                                     ondelete='cascade')
     is_minor = fields.Boolean(related='member_id.is_minor')
     line_ids = fields.One2many('golem.activity.registration.invoicing.line',
                                'invoicing_id', string='Activities')
@@ -72,13 +71,13 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
     payment_ids = fields.Many2many('account.payment', string='Generated payments')
 
     @api.depends('member_id')
-    def _compute_partner_ids(self):
+    def _compute_guardian_ids(self):
         for rec in self:
             partner_ids = rec.member_id.legal_guardian_ids.mapped('legal_guardian_id').ids
             if hasattr(rec.member_id, 'family_member_ids'):
                 partner_ids += rec.member_id.family_member_ids.filtered(
                     lambda r: r.id != self.member_id.partner_id.id).ids
-            rec.partner_ids = [(6, 0, partner_ids)]
+            rec.guardian_ids = [(6, 0, partner_ids)]
 
     def _create_invoice_line(self, product, price, invoice):
         """ Create invoice line : needs cache record for onchange, then real
diff --git a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
index 13c25e4..283c490 100644
--- a/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
+++ b/golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.xml
@@ -33,11 +33,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <group states="init">
             <group name="lines" colspan="2">
               <field name="season_id" readonly="1" />
-              <field name="member_id"/><!-- readonly="1" />-->
-              <field name='on_the_name_of' attrs="{'invisible': [('is_minor', '=', False)]}"
-                options="{'no_create': True}"/>
-              <field name='is_minor' invisible='1'/>
-              <field name="partner_ids" invisible='1'/>
+              <field name="member_id" readonly="0" />
+              <field name="on_the_name_of"
+                attrs="{'invisible': [('is_minor', '=', False)], 'required': [('is_minor', '=', True)]}"
+                options="{'no_create': True}"
+                domain="[('id', 'in', guardian_ids[0][2])]" />
+              <field name="is_minor" invisible="1" />
+              <field name="guardian_ids" invisible="1" widget="many2many_tags" />
               <field name="line_ids" string="Activities and Prices">
                 <tree delete="false" create="false" edit="true" editable="bottom">
                   <field name="activity_id" readonly="1" />