diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 4b76518990e..ee6ec25a10c 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -26,17 +26,23 @@ from datetime import datetime
 class account_asset_category(osv.osv):
     _name = 'account.asset.category'
     _description = 'Asset category'
+
     _columns = {
         'name': fields.char('Asset category', size=64, required=True, select=1),
         'note': fields.text('Note'),
-        'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'), #FIXME:add in the form view  with group = analytic
-        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), #FIXME:add in the form view  with group = analytic
+        'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
         'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
         'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'company_id': fields.many2one('res.company', 'Company'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
     }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context),
+    }
+
 account_asset_category()
 
 #class one2many_mod_asset(fields.one2many):
@@ -189,6 +195,7 @@ class account_asset_asset(osv.osv):
         'method_period': lambda obj, cr, uid, context: 12,
         'method_progress_factor': lambda obj, cr, uid, context: 0.3,
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
 
 
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index f9094bb36a3..a379fd746bd 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -10,7 +10,7 @@
             <form string="Asset category">
            <group col="6" colspan="4">
                 <field name="name" select="1" colspan="4"/>
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 <newline/>
                 <field name="journal_id"/>
                 <field name="account_asset_id"/>
@@ -55,8 +55,8 @@
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
                  <field name="currency_id" select="1"/>
-                 <field name="company_id" select="1"/>
-                 <field name="value_residual"/> 
+                 <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                 <field name="value_residual"/>
               </group>
               <notebook colspan="4">
                  <page string="Depreciation">
@@ -194,6 +194,7 @@
                 <field name="code"/>
                 <field name="value_total"/>
                 <field name="purchase_date"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
         </field>