diff --git a/account_chart_update/i18n/account_chart_update.pot b/account_chart_update/i18n/account_chart_update.pot
index fa0f6f94..882c57d3 100644
--- a/account_chart_update/i18n/account_chart_update.pot
+++ b/account_chart_update/i18n/account_chart_update.pot
@@ -90,12 +90,16 @@ msgid "Create/Update"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:679
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:838
 #, python-format
 msgid "Created account %s."
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_create_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_create_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_create_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_create_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_create_uid
@@ -104,6 +108,16 @@ msgid "Created by"
 msgstr ""
 
 #. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:943
+#, python-format
+msgid "Created fiscal position %s."
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_create_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_create_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_create_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_create_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_create_date
@@ -112,19 +126,13 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:780
-#, python-format
-msgid "Created or updated fiscal position %s."
-msgstr ""
-
-#. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:646
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:801
 #, python-format
 msgid "Created tax %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:641
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:796
 #, python-format
 msgid "Deactivated tax %s."
 msgstr ""
@@ -140,12 +148,16 @@ msgid "Determines where the tax is selectable. Note : 'None' means a tax can't b
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:516
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:631
 #, python-format
 msgid "Differences in these fields: %s."
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_display_name
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_display_name
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_display_name
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_display_name
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_display_name
@@ -154,13 +166,13 @@ msgid "Display Name"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:688
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:847
 #, python-format
 msgid "Exception creating account %s."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:710
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:877
 #, python-format
 msgid "Exception writing account %s."
 msgstr ""
@@ -232,6 +244,15 @@ msgid "Here you can select the fields you want to check if they have been update
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+msgid "Here you can set the matching order."
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_id
@@ -260,6 +281,10 @@ msgid "Language"
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching___last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching___last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching___last_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching___last_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts___last_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account___last_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position___last_update
@@ -268,6 +293,10 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_write_uid
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_write_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_write_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_write_uid
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_write_uid
@@ -276,6 +305,10 @@ msgid "Last Updated by"
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_write_date
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_write_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_write_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_write_date
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_write_date
@@ -288,13 +321,34 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
+msgid "Matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_matching_value
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_matching_value
+msgid "Matching Value"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_log
 msgid "Messages and Errors"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:540
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:671
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:717
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:755
+#, python-format
+msgid "Missing XML-ID."
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:662
 #, python-format
 msgid "Name or description not found."
 msgstr ""
@@ -327,13 +381,13 @@ msgid "Next"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:583
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:709
 #, python-format
 msgid "No account found with this code."
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:617
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:747
 #, python-format
 msgid "No fiscal position found with this name."
 msgstr ""
@@ -356,7 +410,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:296
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:349
 #, python-format
 msgid "One or more errors detected!\n"
 "\n"
@@ -369,7 +423,7 @@ msgid "Other options"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:733
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:900
 #, python-format
 msgid "Post-updated tax %s."
 msgstr ""
@@ -384,6 +438,11 @@ msgstr ""
 msgid "Records to create/update"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_recreate_xml_ids
+msgid "Recreate missing XML-IDs"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_rejected_new_account_number
 msgid "Rejected New Account Number"
@@ -399,6 +458,14 @@ msgstr ""
 msgid "Select records to update"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_sequence
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_sequence
+msgid "Sequence"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_state
 msgid "Status"
@@ -425,7 +492,7 @@ msgid "Tax fields"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:521
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:636
 #, python-format
 msgid "Tax is disabled."
 msgstr ""
@@ -456,13 +523,20 @@ msgstr ""
 msgid "Taxes"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_matching_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fp_matching_ids
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_matching_ids
+msgid "Taxes matching"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.ui.view,arch_db:account_chart_update.view_update_multi_chart
 msgid "This wizard will update your accounts, taxes and fiscal positions according to the selected chart template"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:567
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:693
 #, python-format
 msgid "To deactivate: not in the template"
 msgstr ""
@@ -500,6 +574,10 @@ msgid "Update chart template"
 msgstr ""
 
 #. module: account_chart_update
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_account_matching_update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_fp_matching_update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_matching_update_chart_wizard_id
+#: model:ir.model.fields,field_description:account_chart_update.field_wizard_tax_matching_update_chart_wizard_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_account_update_chart_wizard_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_fiscal_position_update_chart_wizard_id
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_tax_update_chart_wizard_id
@@ -522,27 +600,51 @@ msgid "Update taxes"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:701
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:860
 #, python-format
 msgid "Updated account %s."
 msgstr ""
 
+#. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:867
+#, python-format
+msgid "Updated account %s. (Recreated XML-ID)"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_accounts
 msgid "Updated accounts"
 msgstr ""
 
+#. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:949
+#, python-format
+msgid "Updated fiscal position %s."
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:955
+#, python-format
+msgid "Updated fiscal position %s. (Recreated XML-ID)"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_fps
 msgid "Updated fiscal positions"
 msgstr ""
 
 #. module: account_chart_update
-#: code:addons/account_chart_update/wizard/wizard_chart_update.py:654
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:809
 #, python-format
 msgid "Updated tax %s."
 msgstr ""
 
+#. module: account_chart_update
+#: code:addons/account_chart_update/wizard/wizard_chart_update.py:812
+#, python-format
+msgid "Updated tax %s. (Recreated XML-IDs)"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model.fields,field_description:account_chart_update.field_wizard_update_charts_accounts_updated_taxes
 msgid "Updated taxes"
@@ -560,6 +662,26 @@ msgstr ""
 msgid "Wizard completed"
 msgstr ""
 
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_account_matching
+msgid "wizard.account.matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_fp_matching
+msgid "wizard.fp.matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_matching
+msgid "wizard.matching"
+msgstr ""
+
+#. module: account_chart_update
+#: model:ir.model,name:account_chart_update.model_wizard_tax_matching
+msgid "wizard.tax.matching"
+msgstr ""
+
 #. module: account_chart_update
 #: model:ir.model,name:account_chart_update.model_wizard_update_charts_accounts
 msgid "wizard.update.charts.accounts"
diff --git a/account_chart_update/static/description/index.html b/account_chart_update/static/description/index.html
index f8e62307..3f777fe2 100644
--- a/account_chart_update/static/description/index.html
+++ b/account_chart_update/static/description/index.html
@@ -396,10 +396,8 @@ positions that got modified on the template.</li>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id1">Usage</a></h1>
-<p>The wizard, accessible from
-<em>Accounting &gt; Configuration &gt; Settings &gt; Update chart template</em>,
-lets the user select what kind of objects must be checked/updated, allows to
-set the order of fields matching to be checked/updated and whether
+<p>The wizard, accesible from <em>Accounting &gt; Settings &gt; Update chart of accounts</em>,
+lets the user select what kind of objects must be checked/updated, and whether
 old records must be checked for changes and updates.</p>
 <p>It will display all the objects to be created / updated / deactivated with some
 information about the detected differences, and allow the user to exclude
diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 67c71b72..7428f894 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -290,7 +290,13 @@ class WizardUpdateChartsAccounts(models.TransientModel):
     @api.multi
     def action_init(self):
         """Initial action that sets the initial state."""
-        self.state = 'init'
+        self.write({
+            'state': 'init',
+            'tax_ids': [(2, r.id, False) for r in self.tax_ids],
+            'account_ids': [(2, r.id, False) for r in self.account_ids],
+            'fiscal_position_ids': [(2, r.id, False) for r in
+                                    self.fiscal_position_ids],
+        })
         return self._reopen()
 
     @api.multi