diff --git a/addons/event/event.py b/addons/event/event.py
index 7d2c18a01bc..baa14de9bbe 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,9 +221,10 @@ class event_event(osv.osv):
         user = user_pool.browse(cr,uid,uid,context)
         if not curr_reg_id:
             curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
-                                                    'email':user.user_email,
-                                                    'name':user.name,
-                                                    'subscribe':True,
+                                                         'email':user.user_email,
+                                                         'name':user.name,
+                                                         'user_id':uid,
+                                                         'subscribe':True,
                                                     })
             
             
@@ -293,7 +294,7 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('open', 'Confirmed'),
@@ -306,7 +307,7 @@ class event_registration(osv.osv):
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'user_id': lambda self, cr, uid, ctx: uid,
+        #'user_id': lambda self, cr, uid, ctx: uid,
     }
     _order = 'name, create_date desc'
 
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 0dfbbf6de18..5b4654342c9 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -32,7 +32,6 @@
         <field name="name">Concert of Bon Jovi</field>
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_max">500</field>
         <field name="type" ref="event_type_1"/>
     </record>
@@ -42,7 +41,6 @@
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
@@ -52,7 +50,6 @@
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
-        <field name="user_id" ref="base.user_root"/>
     </record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>