diff --git a/base_comment_template/migrations/13.0.1.0.0/post-migration.py b/base_comment_template/migrations/13.0.1.0.0/post-migration.py
index e1dce39d69..72123749ba 100644
--- a/base_comment_template/migrations/13.0.1.0.0/post-migration.py
+++ b/base_comment_template/migrations/13.0.1.0.0/post-migration.py
@@ -16,6 +16,9 @@ def migrate(env, version):
         SPLIT_PART(ip.value_reference, ',', 2)::int AS base_comment_template_id
         FROM ir_property ip
         JOIN ir_model_fields imf ON ip.fields_id = imf.id
+        JOIN res_partner rp ON rp.id = SPLIT_PART(ip.res_id, ',', 2)::int
+        JOIN base_comment_template bct
+            ON bct.id = SPLIT_PART(ip.value_reference, ',', 2)::int
         WHERE imf.name = 'property_comment_template_id'
         AND imf.model = 'res.partner'
         AND ip.res_id IS NOT NULL
diff --git a/base_comment_template/migrations/13.0.3.0.0/pre-migration.py b/base_comment_template/migrations/13.0.3.0.0/pre-migration.py
new file mode 100644
index 0000000000..2ed210690d
--- /dev/null
+++ b/base_comment_template/migrations/13.0.3.0.0/pre-migration.py
@@ -0,0 +1,21 @@
+# Copyright 2021 Tecnativa - Pedro M: Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade  # pylint: disable=W7936
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    if openupgrade.table_exists(env.cr, "base_comment_template_res_partner_rel"):
+        # Swap column names, as they were incorrect
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME base_comment_template_id TO temp"
+        )
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME res_partner_id TO base_comment_template_id"
+        )
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME temp TO res_partner_id"
+        )