diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d4b08ad2b44..9b8e9edb93b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -125,6 +125,7 @@ class crm_lead(crm_case, osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
+        'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Partner Name", size=64),
         'optin': fields.boolean('Opt-In'),
         'optout': fields.boolean('Opt-Out'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7783c7be1b5..35ea1c335c9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,7 +55,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Contact Name"/>
+                    <field name="name" required="1" string="Subject"/>
                     <field name="priority"/>
                     <field name="categ_id"
                         widget="selection"
@@ -83,9 +83,12 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Lead">
+                    <group colspan="4" col="2">
+                        <field name="partner_name" string="Partner Name" />
+                    </group>
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="partner_name" string="Partner Name" colspan="4"/>
+                        <field name="contact_name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function" />
@@ -232,8 +235,8 @@
             <tree string="Leads"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
-                <field name="name" string="Contact Name"/>
-                <field name="partner_name"/>
+                <field name="name" string="Subject"/>
+                <field name="contact_name"/>
                 <field name="country_id" invisible="context.get('invisible_country', True)" />
                 <field name="email_from"/>
                 <field name="phone"/>
@@ -313,7 +316,7 @@
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                 />
                 <separator orientation="vertical"/>
-                <field name="name"/>
+                <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id">
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index b02cc1f5197..de93e1259f3 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -149,7 +149,7 @@ Leads Could not convert into Opportunity"))
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
         for lead in lead_obj.browse(cr, uid, data, context=context):
             if 'name' in fields:
-                res.update({'name': lead.partner_name})
+                res.update({'name': lead.name})
             if 'partner_id' in fields:
                 res.update({'partner_id': lead.partner_id.id or False})
         return res
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 8592a934647..aeb5b2db673 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -143,13 +143,13 @@ class crm_lead2partner(osv.osv_memory):
             for lead in lead_obj.browse(cr, uid, rec_ids):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
-                        'name': lead.partner_name or lead.name,
+                        'name': lead.partner_name or lead.contact_name or lead.name,
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
                     contact_id = contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
-                        'name': lead.name,
+                        'name': lead.contact_name,
                         'phone': lead.phone,
                         'mobile': lead.mobile,
                         'email': lead.email_from,