diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f51d87d63a8..6bb043e94fd 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -8,21 +8,19 @@
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
-    <!-- 2 steps to avoid making reference to xml id not defined yet -->
-    <record id="group_account_invoice" model="res.groups">
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+    <record id="group_account_user" model="res.groups">
+        <field name="name">Show Full Accounting Features</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_account_user" model="res.groups">
-        <field name="name">Accountant</field>
+    <record id="group_account_manager" model="res.groups">
+        <field name="name">Billing Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
 
-    <record id="group_account_manager" model="res.groups">
-        <field name="name">Adviser</field>
-        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
-        <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
+    <record id="base.user_root" model="res.users">
+        <field name="groups_id" eval="[(4, ref('account.group_account_invoice')), (4, ref('account.group_account_manager'))]"/>
     </record>
 
     <record id="group_warning_account" model="res.groups">
diff --git a/addons/account_accountant/security/account_accountant_security.xml b/addons/account_accountant/security/account_accountant_security.xml
index 1340e7abc94..d86c828209b 100644
--- a/addons/account_accountant/security/account_accountant_security.xml
+++ b/addons/account_accountant/security/account_accountant_security.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <record id="base.user_root" model="res.users">
-            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
         </record>
+
+        <record id="account.group_account_user" model="res.groups">
+            <field name="name">Accountant</field>
+            <field name="implied_ids" eval="[(4, ref('account.group_account_invoice'))]"/>
+            <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+        </record>
+
+        <record id="account.group_account_manager" model="res.groups">
+            <field name="name">Advisor</field>
+            <field name="implied_ids" eval="[(3, ref('account.group_account_invoice')), (4, ref('account.group_account_user'))]"/>
+        </record>
+
 </odoo>