diff --git a/addons/event/event.py b/addons/event/event.py
index b9ca4d3276f..a69e17aa269 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,14 +215,13 @@ class event_event(osv.osv):
     def subscribe_to_event(self,cr,uid,ids,context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
-        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',uid),('event_id','=',ids[0])])
         user = user_pool.browse(cr,uid,uid,context)
+        curr_reg_id = register_pool.search(cr,uid,[('user_id','=',user.id),('event_id','=',ids[0])])
         if not curr_reg_id:
-            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],
-                                                         'email':user.user_email,
-                                                         'name':user.name,
-                                                         'user_id':uid,
-                                                         'subscribe':True})
+            curr_reg_id = register_pool.create(cr, uid, {'event_id':ids[0],'email':user.user_email,
+                                                         'name':user.name,'user_id':user.id,
+                                                         'subscribe':True
+                                                         })
         if isinstance(curr_reg_id, (int, long)):curr_reg_id = [curr_reg_id]
         return register_pool.confirm_registration(cr,uid,curr_reg_id,context)