diff --git a/addons/event/event.py b/addons/event/event.py
index 3fcf63156f6..ba3fedea69e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -326,7 +326,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', 'Attendee (user)', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', 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'),
                                     ('cancel', 'Cancelled'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 223e3cdff5f..8f378af3775 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -71,7 +71,7 @@
                 	<div class="oe_right oe_button_box">
 	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
 	                </div>
-                <!--div class="oe_right" style="height: 200px"></div-->
+                
                 <div class="oe_title" style="width: 650px" >
 	            	<label for="name" class="oe_edit_only"/>
 		            <group colspan="6" col="6">
@@ -99,6 +99,7 @@
 	                   	</group>
                      </group>
                 </div>
+                <!-- <div class="oe_right" style="height: 200px"></div> -->
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
@@ -404,11 +405,11 @@
                             <field name="name" invisible="1"/>
                             <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                             <label for="email" string="E-Mail"/>
-                            <group colspan="1">
-                                <field name="email" invisible="1"/>
+                            <group col="2">
+                                <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">