diff --git a/addons/account/account.py b/addons/account/account.py
index c298a15646b..45308a9e7d4 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3030,6 +3030,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     }
 
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        if context is None:context = {}
         if context.get('default_currency_id', False):
             dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id'))
             return {'value': {'currency_id': view_id}}
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 5ca3a169aba..4dea930f09f 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -6,6 +6,8 @@
             <field name="account_root_id" ref="coa_basic"/>
             <field name="bank_account_view_id" ref="cash_expenditure"/>
             <field name="tax_code_root_id" ref="tax_code_chart_root"/>
+            <field name="property_account_receivable" ref="account_receivable"/>
+            <field name="property_account_payable" ref="account_payable"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>