diff --git a/account_budget_oca/__manifest__.py b/account_budget_oca/__manifest__.py
index d3458127..041ccc98 100644
--- a/account_budget_oca/__manifest__.py
+++ b/account_budget_oca/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Budgets Management",
-    "version": "14.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Accounting",
     "license": "LGPL-3",
     "author": "Odoo S.A., Odoo Community Association (OCA)",
diff --git a/account_budget_oca/security/account_budget_security.xml b/account_budget_oca/security/account_budget_security.xml
index 596704d5..5d85240e 100644
--- a/account_budget_oca/security/account_budget_security.xml
+++ b/account_budget_oca/security/account_budget_security.xml
@@ -1,34 +1,32 @@
-<odoo>
-    <data noupdate="1">
-        <record id="budget_post_comp_rule" model="ir.rule">
-            <field name="name">Budget post multi-company</field>
-            <field name="model_id" ref="model_account_budget_post" />
-            <field name="global" eval="True" />
-            <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
-        </record>
-        <record id="budget_comp_rule" model="ir.rule">
-            <field name="name">Budget multi-company</field>
-            <field name="model_id" ref="model_crossovered_budget" />
-            <field name="global" eval="True" />
-            <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
-        </record>
-        <record id="budget_lines_comp_rule" model="ir.rule">
-            <field name="name">Budget lines multi-company</field>
-            <field name="model_id" ref="model_crossovered_budget_lines" />
-            <field name="global" eval="True" />
-            <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
-        </record>
-        <record id="base.user_root" model="res.users">
-            <field
-                name="groups_id"
-                eval="[(4,ref('analytic.group_analytic_accounting'))]"
-            />
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="budget_post_comp_rule" model="ir.rule">
+        <field name="name">Budget post multi-company</field>
+        <field name="model_id" ref="model_account_budget_post" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+    </record>
+    <record id="budget_comp_rule" model="ir.rule">
+        <field name="name">Budget multi-company</field>
+        <field name="model_id" ref="model_crossovered_budget" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+    </record>
+    <record id="budget_lines_comp_rule" model="ir.rule">
+        <field name="name">Budget lines multi-company</field>
+        <field name="model_id" ref="model_crossovered_budget_lines" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+    </record>
+    <record id="base.user_root" model="res.users">
+        <field
+            name="groups_id"
+            eval="[(4,ref('analytic.group_analytic_accounting'))]"
+        />
+    </record>
 </odoo>
diff --git a/account_budget_oca/tests/common.py b/account_budget_oca/tests/common.py
index 55b088bd..852804bc 100644
--- a/account_budget_oca/tests/common.py
+++ b/account_budget_oca/tests/common.py
@@ -23,7 +23,7 @@ def setUp(self):
         # Checking if the budgetary positions have accounts or not
         account_ids = self.account_model.search(
             [
-                ("user_type_id", "=", self.ref("account.data_account_type_revenue")),
+                ("account_type", "=", "income"),
                 ("tag_ids.name", "in", ["Operating Activities"]),
             ]
         ).ids
@@ -32,7 +32,7 @@ def setUp(self):
                 {
                     "name": "Product Sales - (test)",
                     "code": "X2020",
-                    "user_type_id": self.ref("account.data_account_type_revenue"),
+                    "account_type": "income",
                     "tag_ids": [(6, 0, [self.ref("account.account_tag_operating")])],
                 }
             ).ids
@@ -159,7 +159,7 @@ def setUp(self):
 
         account_ids = self.account_model.search(
             [
-                ("user_type_id.name", "=", "Expenses"),
+                ("account_type", "=", "expense"),
                 ("tag_ids.name", "in", ["Operating Activities"]),
             ]
         ).ids
@@ -169,7 +169,7 @@ def setUp(self):
                 {
                     "name": "Expense - (test)",
                     "code": "X2120",
-                    "user_type_id": self.ref("account.data_account_type_expenses"),
+                    "account_type": "expense",
                     "tag_ids": [(6, 0, [self.ref("account.account_tag_operating")])],
                 }
             ).ids
diff --git a/account_budget_oca/tests/test_theoreticalamount.py b/account_budget_oca/tests/test_theoreticalamount.py
index a4e2c1d2..41ea7260 100644
--- a/account_budget_oca/tests/test_theoreticalamount.py
+++ b/account_budget_oca/tests/test_theoreticalamount.py
@@ -26,13 +26,12 @@ def setUp(self):
             }
         )
         crossovered_budget_line_obj = self.env["crossovered.budget.lines"]
-        user_type_id = self.ref("account.data_account_type_revenue")
         tag_id = self.ref("account.account_tag_operating")
         account_rev = self.env["account.account"].create(
             {
                 "code": "Y2020",
                 "name": "Budget - Test Revenue Account",
-                "user_type_id": user_type_id,
+                "account_type": "income",
                 "tag_ids": [(4, tag_id, 0)],
             }
         )
diff --git a/account_budget_oca/views/account_budget_views.xml b/account_budget_oca/views/account_budget_views.xml
index c09479e1..8e44b2be 100644
--- a/account_budget_oca/views/account_budget_views.xml
+++ b/account_budget_oca/views/account_budget_views.xml
@@ -55,6 +55,12 @@
                         groups="base.group_multi_company"
                         options="{'no_create': True}"
                     />
+                    <field
+                        name="company_id"
+                        invisible="1"
+                        groups="!base.group_multi_company"
+                        options="{'no_create': True}"
+                    />
                 </group>
                 <notebook>
                     <page string="Accounts">
@@ -253,7 +259,6 @@
             <tree
                 decoration-info="state == 'draft'"
                 decoration-muted="state in ('done','cancel')"
-                string="Budget"
             >
                 <field name="name" colspan="1" />
                 <field name="date_from" />