diff --git a/account.py b/account.py
index 0b0f94d326..d287a5d874 100644
--- a/account.py
+++ b/account.py
@@ -1746,6 +1746,13 @@ class CreateChartAccountAccount(ModelView):
     account_template = fields.Many2One('account.account.template',
             'Account Template', required=True, domain=[('parent', '=', False)])
 
+    def default_company(self, cursor, user, context=None):
+        if context is None:
+            context = {}
+        if context.get('company'):
+            return context['company']
+        return False
+
 CreateChartAccountAccount()
 
 
diff --git a/account.xml b/account.xml
index d1bf86c1b3..a21ef0b302 100644
--- a/account.xml
+++ b/account.xml
@@ -461,9 +461,9 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <form string="Create Chart of Account" col="2">
                     <label name="company"/>
-                    <field name="company"/>
+                    <field name="company" widget="selection"/>
                     <label name="account_template"/>
-                    <field name="account_template"/>
+                    <field name="account_template" widget="selection"/>
                 </form>
                 ]]>
             </field>