diff --git a/addons/phone_validation/tools/phone_validation.py b/addons/phone_validation/tools/phone_validation.py
index 718b0518802..940c4300f26 100644
--- a/addons/phone_validation/tools/phone_validation.py
+++ b/addons/phone_validation/tools/phone_validation.py
@@ -43,11 +43,10 @@ try:
             else:
                 _logger.warning(_('Unable to format %s:\n%s') % number, e)
                 return number
-        if always_international and phone_nbr.country_code != country_phone_code:
+        if always_international or phone_nbr.country_code != country_phone_code:
             phone_fmt = phonenumbers.PhoneNumberFormat.INTERNATIONAL
         else:
             phone_fmt = phonenumbers.PhoneNumberFormat.NATIONAL
-
         return phonenumbers.format_number(phone_nbr, phone_fmt)
 
 except ImportError:
diff --git a/addons/phone_validation/views/res_company_view.xml b/addons/phone_validation/views/res_company_view.xml
index d788e5aa7fe..c6401c02cb9 100644
--- a/addons/phone_validation/views/res_company_view.xml
+++ b/addons/phone_validation/views/res_company_view.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  The purpose of this view is to move the VAT field at the top of the 
-  company form. That way, the user will fill it first
--->
 <odoo>
     <record id="res_company_view_form_phone_validation" model="ir.ui.view">
         <field name="name">res.company.view.form.phone_validation</field>