diff --git a/l10n_es_aeat_mod390/data/2021/aeat.model.export.config.line.csv b/l10n_es_aeat_mod390/data/2021/aeat.model.export.config.line.csv
index eafd73dfc17..54da9a8301b 100644
--- a/l10n_es_aeat_mod390/data/2021/aeat.model.export.config.line.csv
+++ b/l10n_es_aeat_mod390/data/2021/aeat.model.export.config.line.csv
@@ -4,8 +4,8 @@ aeat_mod390_2021_sub06_export_line_02,"left",,,,"aeat_mod390_2021_sub06_export_c
 aeat_mod390_2021_sub06_export_line_03,"left",,,,"aeat_mod390_2021_sub06_export_config","string",,"06","Página","3","2",
 aeat_mod390_2021_sub06_export_line_04,"left",,,,"aeat_mod390_2021_sub06_export_config","string",,"000>","Constante: 000>","4","4",
 aeat_mod390_2021_sub06_export_line_05,"left",,,,"aeat_mod390_2021_sub06_export_config","string",,,"Indicador de página complementaria: En blanco","5","1",
-aeat_mod390_2021_sub06_export_line_06,"right","False",,"2","aeat_mod390_2021_sub06_export_config","float",,"0","7. Resultado liquidación anual - Regularización cuotas art. 80.Cinco.5ª LIVA [658]","6","17",
-aeat_mod390_2021_sub06_export_line_07,"right","True",,"2","aeat_mod390_2021_sub06_export_config","float","${object.casilla_65}",,"7. Resultado liquidación anual - Suma de resultados [84]","7","17",
+aeat_mod390_2021_sub06_export_line_06,"right","False",,"2","aeat_mod390_2021_sub06_export_config","float","${object.casilla_658}",,"7. Resultado liquidación anual - Regularización cuotas art. 80.Cinco.5ª LIVA [658]","6","17",
+aeat_mod390_2021_sub06_export_line_07,"right","True",,"2","aeat_mod390_2021_sub06_export_config","float","${object.casilla_84}",,"7. Resultado liquidación anual - Suma de resultados [84]","7","17",
 aeat_mod390_2021_sub06_export_line_08,"right","False",,"2","aeat_mod390_2021_sub06_export_config","float",,"0","7. Resultado liquidación anual - IVA a la importación liquidado por la Aduana (sólo sujetos pasivos con opción de diferimiento) [659]","8","17",
 aeat_mod390_2021_sub06_export_line_09,"right","False",,"2","aeat_mod390_2021_sub06_export_config","float","${object.casilla_85}",,"7. Resultado liquidación anual - Compensación de cuotas ejercicio anterior [85]","9","17",
 aeat_mod390_2021_sub06_export_line_10,"right","True",,"2","aeat_mod390_2021_sub06_export_config","float","${object.casilla_86}",,"7. Resultado liquidación anual - Resultado de la liquidación [86]","10","17",
diff --git a/l10n_es_aeat_mod390/models/mod390.py b/l10n_es_aeat_mod390/models/mod390.py
index 05f79ff9cbc..d9b0174abda 100644
--- a/l10n_es_aeat_mod390/models/mod390.py
+++ b/l10n_es_aeat_mod390/models/mod390.py
@@ -323,11 +323,19 @@ class L10nEsAeatMod390Report(models.Model):
         store=True,
         string="[65] Result. rég. gral.",
     )
+    casilla_658 = fields.Monetary(
+        string="[658] Regularización cuotas art. 80. Cinco.5ª LIVA",
+    )
     casilla_662 = fields.Monetary(
         string="[662] Cuotas pendientes de compensación al término del ejercicio",
         help="[662] Cuotas pendientes de compensación generadas en el ejercicio "
         "y distintas de las incluidas en la casilla 97",
     )
+    casilla_84 = fields.Monetary(
+        compute="_compute_casilla_84",
+        store=True,
+        string="[84] Suma de resultados",
+    )
     casilla_85 = fields.Monetary(
         string="[85] Compens. ejercicio anterior",
         help="Si en la autoliquidación del último período del ejercicio "
@@ -690,11 +698,15 @@ def _compute_casilla_65(self):
         for report in self:
             report.casilla_65 = report.casilla_47 - report.casilla_64
 
-    @api.depends("casilla_65", "casilla_85")
+    @api.depends("casilla_65", "casilla_658")
+    def _compute_casilla_84(self):
+        for report in self:
+            report.casilla_84 = report.casilla_65 + report.casilla_658
+
+    @api.depends("casilla_84", "casilla_85")
     def _compute_casilla_86(self):
         for report in self:
-            # It takes 65 instead of 84 + 659 as the rest are 0
-            report.casilla_86 = report.casilla_65 - report.casilla_85
+            report.casilla_86 = report.casilla_84 - report.casilla_85
 
     @api.depends("tax_line_ids", "tax_line_ids.amount")
     def _compute_casilla_108(self):
diff --git a/l10n_es_aeat_mod390/views/mod390_view.xml b/l10n_es_aeat_mod390/views/mod390_view.xml
index 3356a772f95..29150e158bd 100644
--- a/l10n_es_aeat_mod390/views/mod390_view.xml
+++ b/l10n_es_aeat_mod390/views/mod390_view.xml
@@ -294,6 +294,11 @@
                                 name="casilla_65"
                                 class="oe_subtotal_footer_separator"
                             />
+                            <field
+                                name="casilla_658"
+                                readonly="state != 'calculated'"
+                            />
+                            <field name="casilla_84" readonly="state != 'calculated'" />
                             <field name="casilla_85" readonly="state != 'calculated'" />
                             <field
                                 name="casilla_86"