diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c3b3015f8b3..872910aaf95 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -155,7 +155,7 @@ class res_partner(osv.osv):
         'fax': fields.char('Fax', size=64),
         'mobile': fields.char('Mobile', size=64),
         'birthdate': fields.char('Birthdate', size=64),
-        'is_company': fields.selection( [ ('contact','Person'),('partner','Company') ],'Partner Type', help="Select if the partner is a company or person"),
+        'is_company': fields.selection( [ ('contact','Person'),('partner','Company') ],'Contact Type', help="Select if the partner is a company or person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Check to use the company's address"),
         'photo': fields.binary('Photo'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
@@ -174,7 +174,7 @@ class res_partner(osv.osv):
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
         'color': 0,
-        'is_company': False,
+        'is_company': 'contact',
         'type': 'default',
     }
 
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index c794a821ca6..017abc13e79 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -93,60 +93,60 @@
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="website">www.asustek.com</field>
         </record>
         <record id="res_partner_agrolait" model="res.partner">
             <field name="name">Agrolait</field>
             <field eval="[(6, 0, [ref('base.res_partner_category_0')])]" name="category_id"/>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="website">www.agrolait.com</field>
         </record>
         <record id="res_partner_c2c" model="res.partner">
             <field name="name">Camptocamp</field>
             <field eval="[(6, 0, [ref('res_partner_category_10'), ref('res_partner_category_5')])]" name="category_id"/>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="supplier">1</field>
             <field name="website">www.camptocamp.com</field>
         </record>
         <record id="res_partner_sednacom" model="res.partner">
             <field name="website">www.syleam.fr</field>
             <field name="name">Syleam</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
         </record>
         <record id="res_partner_thymbra" model="res.partner">
             <field name="name">SmartBusiness</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
         </record>
         <record id="res_partner_desertic_hispafuentes" model="res.partner">
             <field name="name">Axelor</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="website">www.axelor.com/</field>
         </record>
         <record id="res_partner_tinyatwork" model="res.partner">
             <field name="name">Tiny AT Work</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_5'), ref('res_partner_category_10')])]" name="category_id"/>
             <field name="website">www.tinyatwork.com/</field>
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="website">www.wealthyandsons.com/</field>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="website">www.chinaexport.com/</field>
         </record>
         <record id="res_partner_4" model="res.partner">
             <field name="name">Distrib PC</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
@@ -154,20 +154,20 @@
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
             <field name="website">www.eci-liege.info//</field>
         </record>
         <record id="res_partner_6" model="res.partner">
             <field name="name">Elec Import</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
         </record>
         <record id="res_partner_maxtor" model="res.partner">
             <field name="name">Maxtor</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="32000.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
@@ -175,7 +175,7 @@
         </record>
         <record id="res_partner_seagate" model="res.partner">
             <field name="name">Seagate</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="5000.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
@@ -183,32 +183,32 @@
         <record id="res_partner_8" model="res.partner">
             <field name="website">http://mediapole.net</field>
             <field name="name">Mediapole SPRL</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
         </record>
         <record id="res_partner_9" model="res.partner">
             <field name="website">www.balmerinc.com</field>
             <field name="name">BalmerInc S.A.</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="12000.00" name="credit_limit"/>
             <field name="ref">or</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
         </record>
         <record id="res_partner_10" model="res.partner">
             <field name="name">Tecsas</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="ean13">3020170000003</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
         </record>
         <record id="res_partner_11" model="res.partner">
             <field name="name">Leclerc</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="1200.00" name="credit_limit"/>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
         </record>
         <record id="res_partner_14" model="res.partner">
             <field name="name">Centrale d'achats BML</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="ean13">3020178572427</field>
             <field eval="15000.00" name="credit_limit"/>
             <field name="parent_id" ref="res_partner_10"/>
@@ -216,7 +216,7 @@
         </record>
         <record id="res_partner_15" model="res.partner">
             <field name="name">Magazin BML 1</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="ean13">3020178570171</field>
             <field name="parent_id" ref="res_partner_14"/>
             <field eval="1500.00" name="credit_limit"/>
@@ -224,7 +224,7 @@
         </record>
         <record id="res_partner_accent" model="res.partner">
             <field name="name">Université de Liège</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="website">http://www.ulg.ac.be/</field>
         </record>
@@ -236,7 +236,7 @@
         <record id="res_partner_duboissprl0" model="res.partner">
             <field eval="'Sprl Dubois would like to sell our bookshelves but they have no storage location, so it would be exclusively on order'" name="comment"/>
             <field name="name">Dubois sprl</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field name="website">http://www.dubois.be/</field>
         </record>
 
@@ -259,13 +259,13 @@
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
             <field name="name">The Shelve House</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
             <field name="name">Vicking Direct</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_miscellaneoussuppliers0')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field name="customer">0</field>
@@ -274,7 +274,7 @@
 
         <record id="res_partner_woodywoodpecker0" model="res.partner">
             <field name="name">Wood y Wood Pecker</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_woodsuppliers0')])]" name="category_id"/>
             <field name="supplier">1</field>
             <field eval="0" name="customer"/>
@@ -283,7 +283,7 @@
 
         <record id="res_partner_zerooneinc0" model="res.partner">
             <field name="name">ZeroOne Inc</field>
-            <field eval="1" name="is_company"/>
+            <field name="is_company">partner</field>
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
             <field name="website">http://www.zerooneinc.com/</field>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index cd70bf8295a..199baaaa2ee 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -345,9 +345,12 @@
                         <page string="General">
                             <group colspan="2">
                                 <separator string="Address" colspan="4"/>
-                                <field name="type" string="Type"/>
-                                <field name="use_parent_address" attrs="{'invisible': [('parent_id', '=', False)]}"
-                                    on_change="onchange_address(use_parent_address, parent_id)"/>
+                                <group colspan="2">
+                                <field name="type" string="Type" attrs="{'invisible': [('is_company','=', 'partner')]}"/>
+                                </group>
+                                <group colspan="2">
+                                <field name="use_parent_address" attrs="{'invisible': [('parent_id', '=', False)]}" on_change="onchange_address(use_parent_address, parent_id)"/>
+                                </group>
                                 <newline/>
                                 <field name="street" colspan="4" attrs="{'readonly': [('use_parent_address','=', True)]}"/>
                                 <field name="street2" colspan="4" attrs="{'readonly': [('use_parent_address','=', True)]}"/>