diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 583b769d315..9b77ae77733 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -111,8 +111,8 @@ class account_config_settings(osv.osv_memory):
         'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
-        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
-        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
+        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax', help="Selected tax will be applied by default to Product's Sale Tax, while creating a new product"),
+        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax', help="Selected tax will be applied by default to Product's Purchase Tax, while creating a new product"),
         'decimal_precision': fields.integer('Decimal Precision',
             help="""Set the decimal precision for rounding results in accounting."""),
     }
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 41a0b121735..8d49cb856e3 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,9 +21,10 @@
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-                        <field name="has_default_company" invisible="1" />
+                        <separator string="Accounting Details of Company" colspan="4"/>
+                        <field name="has_default_company" invisible="1"/>
                         <field name="has_chart_of_accounts" invisible="1"/>
-                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" on_change="onchange_company_id(company_id)"
                             attrs="{'invisible': [('has_default_company', '=', True)]}"/>
                         <field name="expects_chart_of_accounts"/>
 
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index d4baa2d6099..243399bd2e0 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -89,5 +89,13 @@ class account_config_settings(osv.osv_memory):
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
+    
+    def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+        res = {}
+        if module_purchase_analytic_plans:
+            res['value'] = {'group_analytic_account_for_purchases': True}
+        else:
+            res['value'] = {'group_analytic_account_for_purchases': False}
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 575863fddc4..d0548c2c96f 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -54,7 +54,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_purchases"/>
-                    <field name="module_purchase_analytic_plans"/>
+                    <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 1007107f1a0..f6e3763f25c 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -190,5 +190,13 @@ class account_config_settings(osv.osv_memory):
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
+    
+    def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None):
+        res = {}
+        if module_sale_analytic_plans:
+            res['value'] = {'group_analytic_account_for_sales': True}
+        else:
+            res['value'] = {'group_analytic_account_for_sales': False}
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index fa8aa2baa8e..c633ee4165e 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -60,7 +60,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_sales"/>
-                    <field name="module_sale_analytic_plans"/>
+                    <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
                 </group>
             </field>
         </record>