diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index e52bf54545c..c5594f76e22 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -225,7 +225,7 @@
                             <field name="parent_id"  groups="base.group_multi_company"/>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="photo" nolabel="1" widget="image"/>
+                            <field name="logo" nolabel="1" widget="image"/>
                         </group>
                     </group>
                     <notebook colspan="4">
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 1e8c35c9500..e6fcd92c298 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -143,7 +143,6 @@ class res_company(osv.osv):
         'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32), 
         'company_registry': fields.char('Company Registry', size=64),
         'paper_format': fields.selection([('a4', 'A4'), ('us_letter', 'US Letter')], "Paper Format", required=True),
-        'photo': fields.related('partner_id', 'photo', string="Photo", type="binary"),
     }
     _sql_constraints = [
         ('name_uniq', 'unique (name)', 'The company name must be unique !')
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index a6b93b865a4..ba161731e6c 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -259,13 +259,15 @@ class res_partner(osv.osv):
         return super(res_partner,self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context={}
         # Update parent and siblings records
         if vals.get('parent_id') and vals.get('use_parent_address'):
             domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
             update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
-        if 'photo' not in vals:
-            vals['photo'] = self._get_photo(cr, uid, vals.get('is_company', False), context)
+        if 'photo' not in vals  :
+            vals['photo'] = self._get_photo(cr, uid, vals.get('is_company', False) or context.get('default_is_company'), context)
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):