diff --git a/agreement_legal/models/agreement.py b/agreement_legal/models/agreement.py
index acde0f53a..947deffb2 100644
--- a/agreement_legal/models/agreement.py
+++ b/agreement_legal/models/agreement.py
@@ -210,6 +210,12 @@ class Agreement(models.Model):
         "agreement is an amendment to another agreement. This list will "
         "only show other agreements related to the same account.",
     )
+    create_uid_parent = fields.Many2one(
+        related="parent_agreement_id.create_uid", string="Created by (parent)"
+    )
+    create_date_parent = fields.Datetime(
+        related="parent_agreement_id.create_date", string="Created on (parent)"
+    )
     recital_ids = fields.One2many(
         "agreement.recital", "agreement_id", string="Recitals", copy=True
     )
@@ -279,19 +285,6 @@ class Agreement(models.Model):
         help="""Final placeholder expression, to be copy-pasted in the desired
          template field.""",
     )
-    created_by = fields.Many2one(
-        "res.users",
-        string="Created By",
-        copy=False,
-        default=lambda self: self.env.user,
-        help="User which create the agreement.",
-    )
-    date_created = fields.Datetime(
-        string="Created On",
-        copy=False,
-        default=lambda self: fields.Datetime.now(),
-        help="Date which create the agreement.",
-    )
     template_id = fields.Many2one(
         "agreement",
         string="Template",
@@ -384,8 +377,6 @@ class Agreement(models.Model):
             "parent_agreement_id": self.id,
             "version": self.version,
             "revision": self.revision,
-            "created_by": self.created_by.id,
-            "date_created": self.date_created,
             "code": "{}-V{}".format(self.code, str(self.version)),
             "stage_id": self.stage_id.id,
         }
@@ -400,13 +391,8 @@ class Agreement(models.Model):
             # Make a current copy and mark it as old
             rec.copy(default=rec._get_old_version_default_vals())
             # Update version, created by and created on
-            rec.update(
-                {
-                    "version": rec.version + 1,
-                    "created_by": self.env.user.id,
-                    "date_created": fields.Datetime.now(),
-                }
-            )
+            rec.update({"version": rec.version + 1})
+            # Reset revision to 0 since it's a new version
         return super().write({"revision": 0})
 
     def _get_new_agreement_default_vals(self):
diff --git a/agreement_legal/views/agreement.xml b/agreement_legal/views/agreement.xml
index d72606ba3..8471e89b9 100644
--- a/agreement_legal/views/agreement.xml
+++ b/agreement_legal/views/agreement.xml
@@ -364,8 +364,27 @@
                             name="revision"
                             readonly="True"
                         />
-                        |  Created By: <field name="created_by" readonly="True" />
-                        |  Created On: <field name="date_created" readonly="True" />
+                        |  Created By:
+                        <field
+                            name="create_uid"
+                            readonly="True"
+                            attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
+                        />
+                        <field
+                            name="create_uid_parent"
+                            attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
+                        />
+                        |  Created On:
+                        <field
+                            name="create_date"
+                            readonly="True"
+                            attrs="{'invisible': [('parent_agreement_id', '!=', False)]}"
+                        />
+                        <field
+                            name="create_date_parent"
+                            readonly="True"
+                            attrs="{'invisible': [('parent_agreement_id', '=', False)]}"
+                        />
                     </p>
                 </sheet>
                 <div class="oe_chatter">