diff --git a/base_phone/__manifest__.py b/base_phone/__manifest__.py
index a2aba3f..04bdd91 100644
--- a/base_phone/__manifest__.py
+++ b/base_phone/__manifest__.py
@@ -28,13 +28,13 @@
     'summary': 'Validate phone numbers',
     'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
-    'depends': ['base', 'web'],
+    'depends': ['base_setup', 'web'],
     'external_dependencies': {'python': ['phonenumbers']},
     'data': [
         'security/phone_security.xml',
         'security/ir.model.access.csv',
         'views/res_partner_view.xml',
-        'views/res_company_view.xml',
+        'views/base_config_settings.xml',
         'views/res_users_view.xml',
         'wizard/reformat_all_phonenumbers_view.xml',
         'wizard/number_not_found_view.xml',
diff --git a/base_phone/models/__init__.py b/base_phone/models/__init__.py
index 0252a7d..9ecb43c 100644
--- a/base_phone/models/__init__.py
+++ b/base_phone/models/__init__.py
@@ -2,6 +2,7 @@
 
 from . import base
 from . import res_company
+from . import base_config_settings
 from . import res_partner
 from . import phone_common
 from . import ir_fields_converter
diff --git a/base_phone/models/base_config_settings.py b/base_phone/models/base_config_settings.py
new file mode 100644
index 0000000..a25abde
--- /dev/null
+++ b/base_phone/models/base_config_settings.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields
+
+
+class BaseConfigSettings(models.TransientModel):
+    _inherit = 'base.config.settings'
+
+    number_of_digits_to_match_from_end = fields.Integer(
+        related='company_id.number_of_digits_to_match_from_end')
diff --git a/base_phone/views/base_config_settings.xml b/base_phone/views/base_config_settings.xml
new file mode 100644
index 0000000..df157d7
--- /dev/null
+++ b/base_phone/views/base_config_settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  © 2014-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+
+<odoo>
+
+
+<record id="view_general_configuration" model="ir.ui.view">
+    <field name="name">base_phone.base.config.settings.form</field>
+    <field name="model">base.config.settings</field>
+    <field name="inherit_id" ref="base_setup.view_general_configuration" />
+    <field name="arch" type="xml">
+        <group name="report" position="before">
+            <group name="phone" string="Phone">
+                <label for="number_of_digits_to_match_from_end"/>
+                <div>
+                    <field name="number_of_digits_to_match_from_end" class="oe_inline"/>
+                </div>
+            </group>
+        </group>
+    </field>
+</record>
+
+
+</odoo>
diff --git a/base_phone/views/res_company_view.xml b/base_phone/views/res_company_view.xml
deleted file mode 100644
index 896703b..0000000
--- a/base_phone/views/res_company_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  © 2014-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-
-<odoo>
-
-    <record id="view_company_form" model="ir.ui.view">
-        <field name="name">base_phone.company.form</field>
-        <field name="model">res.company</field>
-        <field name="inherit_id" ref="base.view_company_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//notebook" position="inside">
-                <page string="Phone">
-                    <group name="phone" string="Phone">
-                        <field name="number_of_digits_to_match_from_end" />
-                    </group>
-                </page>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>