diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index c83ab014c36..3cf2adac98d 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -24,7 +24,7 @@ class crm_contact_us(osv.TransientModel):
         read datas generated through this module.  That's why we'll write those
         information in the crm.lead table and leave blank entries in the
         portal_crm.crm_contact_us table.  This is why the create() method is
-        overridden.
+        overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
 
@@ -37,6 +37,16 @@ class crm_contact_us(osv.TransientModel):
         is figured out.
         """
         values['contact_name'] = values['name']
+
+        """
+        The email_from field only makes sense if the form is submitted by an
+        anonymous user; otherwise it should be the current user's email.
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+
+        if (user.login != 'anonymous'):
+            values['email_from'] = user.user_email
+
         crm_lead.create(cr, 1, dict(values,user_id=False), context)
 
         """
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 4b0110f0508..5414c8d6ccc 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -17,7 +17,11 @@
                                 <div class="oe_portal_crm_contact_form">
                                     <field name="name" placeholder="Name"/>
                                     <field name="partner_name" placeholder="Company"/>
-                                    <field name="email_from" placeholder="Email"/>
+                                    <!--
+                                        The email field only makes sense for the anonymous user.
+                                        In other cases, it's auto-filled in the python code.
+                                    -->
+                                    <field name="email_from" placeholder="Email" groups="anonymous.group_anonymous"/>
                                     <field name="phone" placeholder="Phone"/>
                                     <field name="description" placeholder="Your question"/>
                                     <button string="Submit" name="submit" type="object"/>