diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 32b5e08d7b6..69d7cbc577b 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -235,7 +235,7 @@ class res_partner(osv.osv):
         address_obj = self.pool.get('res.partner.address')
         address_ids = address_obj.search(cr, uid, [('partner_id', 'in', ids)])
         address_rec = address_obj.read(cr, uid, address_ids, ['type'])
-        res = list(tuple(addr.values()) for addr in address_rec)
+        res = list((addr['type'],addr['id']) for addr in address_rec)
         adr = dict(res)
         # get the id of the (first) default address if there is one,
         # otherwise get the id of the first address in the list
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index b489a4d6e79..1f0e8f88b1c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -82,7 +82,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
                         <newline/>
                         <field name="name"/>
-                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
+                        <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function"/>
                     </group>
                       <group colspan="2" col="2">
@@ -214,7 +214,7 @@
             <field name="arch" type="xml">
                 <form string="Contacts">
                     <field name="name" select="1"/>
-                    <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
+                    <field domain="[('domain', '=', 'contact')]" name="title"/>
                     <field name="street"/>
                     <field name="street2"/>
                     <field name="type"/>
@@ -331,7 +331,7 @@
                         <group colspan="5" col="6">
                             <field name="name" select="1"/>
                             <field name="ref" groups="base.group_extended"/>
-                            <field domain="[('domain', '=', 'partner')]" name="title" size="0" groups="base.group_extended" widget="selection"/>
+                            <field domain="[('domain', '=', 'partner')]" name="title" size="0" groups="base.group_extended"/>
                             <field name="lang"/>
                         </group>
                         <group colspan="1" col="2">
@@ -345,8 +345,8 @@
                             <field colspan="4" mode="form,tree" name="address" nolabel="1" select="1" height="260">
                                 <form string="Partner Contacts">
                                     <group colspan="4" col="6">
-                                        <field name="name"/>
-                                        <field domain="[('domain', '=', 'contact')]" name="title" size="0" widget="selection"/>
+                                        <field name="name" string="Contact Name"/>
+                                        <field domain="[('domain', '=', 'contact')]" name="title" size="0"/>
                                         <field name="function"/>
                                     </group>
                                     <newline/>