diff --git a/bemade_sethy_configuration/__manifest__.py b/bemade_sethy_configuration/__manifest__.py
index d21faaf..da5c4cf 100644
--- a/bemade_sethy_configuration/__manifest__.py
+++ b/bemade_sethy_configuration/__manifest__.py
@@ -11,7 +11,6 @@
     'license': 'GPL-3',
     'depends': [
         # List of module dependencies
-        'account',
         'base',
         'contacts',
         'crm',
diff --git a/bemade_sethy_configuration/data/company_data.xml b/bemade_sethy_configuration/data/company_data.xml
index 7149fb6..e9bb6d1 100644
--- a/bemade_sethy_configuration/data/company_data.xml
+++ b/bemade_sethy_configuration/data/company_data.xml
@@ -13,8 +13,8 @@
             <field name="zip">J2G 3V3</field>
             <field name="country_id" ref="base.ca"/>
             <field name="phone">450 994-3173</field>
-<!--            <field name="account_sale_tax_id" ref="account.1_gstqst_sale_tax_14975"/>-->
-<!--            <field name="account_purchase_tax_id" ref="account.1_gstqst_purchase_tax_14975"/>-->
+            <field name="account_sale_tax_id" ref="account.1_gstqst_sale_tax_14975"/>
+            <field name="account_purchase_tax_id" ref="account.1_gstqst_purchase_tax_14975"/>
         </record>
     </data>
 </odoo>
diff --git a/bemade_sethy_configuration/views/res_partner_views.xml b/bemade_sethy_configuration/views/res_partner_views.xml
index f93c116..745c4c1 100644
--- a/bemade_sethy_configuration/views/res_partner_views.xml
+++ b/bemade_sethy_configuration/views/res_partner_views.xml
@@ -14,11 +14,10 @@
             <xpath expr="//field[@name='name' and @id='company']" position="replace">
                 <field id="company" class="text-break" name="name" default_focus="1"
                        placeholder="e.g. Lumber Inc"
-                       required="type  == 'contact'"
-                       invisible="is_company == False or is_property == True"
-                />
+                       required="type == 'contact'"
+                       invisible="not is_company or is_property"/>
                 <field id="lot_number" class="text-break" name="lot_number" placeholder="123456789"
-                       invisible="is_property == False"/>
+                       invisible="not is_property"/>
             </xpath>
 
             <button name="schedule_meeting" position="attributes">
@@ -34,11 +33,11 @@
             </button>
 
             <button name="%(payment.action_payment_token)d" position="attributes">
-                <attribute name="invisible">payment_token_count == 0 or is_property == True</attribute>
+                <attribute name="invisible">payment_token_count == 0 or is_property</attribute>
             </button>
 
             <xpath expr="//page[@name='contact_addresses']" position="attributes">
-                <attribute name="invisible">is_property == True</attribute>
+                <attribute name="invisible">is_property</attribute>
             </xpath>
 
             <xpath expr="//page[@name='sales_purchases']" position="attributes">
@@ -54,11 +53,11 @@
             </xpath>
 
             <xpath expr="//field[@name='function']/ancestor::group[1]" position="attributes">
-                <attribute name="invisible">is_property == True</attribute>
+                <attribute name="invisible">is_property  == True</attribute>
             </xpath>
 
             <xpath expr="//field[@name='function']/ancestor::group[1]" position="after">
-                <group invisible="is_property == False">
+                <group invisible="is_property ==  False">
                     <field name="surface"/>
                     <field name="category_id" widget="many2many_tags"
                            options="{'color_field': 'color', 'no_create_edit': True}"/>
@@ -82,7 +81,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group string="All Properties" invisible="is_property  == True">
+                    <group string="All Properties" invisible="is_property == True">
                         <field name="relation_owner_ids" string="">
                             <tree editable="top">
                                 <field name="this_partner_id" required="True"