diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 8e99fe9bc47..6f4af968ec0 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1054,9 +1054,8 @@
             <field name="code">zw</field>
         </record>
 
-        <record id="main_partner" model="res.partner">
+        <record id="main_partner" model="res.partner" context="{'default_is_company': True}">
             <field name="name">Your Company</field>
-            <!-- Address and Company ID will be set later -->
             <field name="company_id" eval="None"/>
             <field name="customer" eval="False"/>
             <field name="is_company" eval="True"/>