diff --git a/OpenOversight/app/main/downloads.py b/OpenOversight/app/main/downloads.py
index 8aead13ce..e055618ab 100644
--- a/OpenOversight/app/main/downloads.py
+++ b/OpenOversight/app/main/downloads.py
@@ -162,5 +162,5 @@ def descriptions_record_maker(description: Description) -> _Record:
         "created_by": description.created_by,
         "officer_id": description.officer_id,
         "created_at": description.created_at,
-        "updated_at": description.updated_at,
+        "last_updated_at": description.last_updated_at,
     }
diff --git a/OpenOversight/app/main/model_view.py b/OpenOversight/app/main/model_view.py
index 8166fa032..61c207836 100644
--- a/OpenOversight/app/main/model_view.py
+++ b/OpenOversight/app/main/model_view.py
@@ -80,8 +80,13 @@ def new(self, form=None):
 
         if form.validate_on_submit():
             new_obj = self.create_function(form, current_user)
+            if hasattr(new_obj, "created_by"):
+                new_obj.created_by = current_user.get_id()
+            if hasattr(new_obj, "last_updated_by"):
+                new_obj.last_updated_by = current_user.get_id()
             db.session.add(new_obj)
             db.session.commit()
+
             match self.model.__name__:
                 case Incident.__name__:
                     Department(id=new_obj.department_id).remove_database_cache_entries(
@@ -117,20 +122,6 @@ def edit(self, obj_id, form=None):
 
         if not form:
             form = self.get_edit_form(obj)
-            # if the object doesn't have a creator id set it to current user
-            if (
-                hasattr(obj, "created_by")
-                and hasattr(form, "created_by")
-                and getattr(obj, "created_by")
-            ):
-                form.created_by.data = obj.created_by
-            elif hasattr(form, "created_by"):
-                form.created_by.data = current_user.get_id()
-
-            # if the object keeps track of who updated it last, set to current user
-            if hasattr(obj, "last_updated_by") and hasattr(form, "last_updated_by"):
-                form.last_updated_by.data = current_user.get_id()
-                form.last_updated_at.data = datetime.datetime.now()
 
         if hasattr(form, "department"):
             add_department_query(form, current_user)
@@ -225,8 +216,15 @@ def get_department_id(self, obj):
 
     def populate_obj(self, form, obj):
         form.populate_obj(obj)
-        if hasattr(obj, "updated_at"):
-            obj.updated_at = datetime.datetime.now()
+
+        # if the object doesn't have a creator id set it to current user
+        if hasattr(obj, "created_by") and not getattr(obj, "created_by"):
+            obj.created_by = current_user.get_id()
+        # if the object keeps track of who updated it last, set to current user
+        if hasattr(obj, "last_updated_at"):
+            obj.last_updated_at = datetime.datetime.now()
+            obj.last_updated_by = current_user.get_id()
+
         db.session.add(obj)
         db.session.commit()
 
diff --git a/OpenOversight/app/main/views.py b/OpenOversight/app/main/views.py
index 5e1fdcd67..cbedccc6a 100644
--- a/OpenOversight/app/main/views.py
+++ b/OpenOversight/app/main/views.py
@@ -1796,7 +1796,7 @@ def download_dept_descriptions_csv(department_id: int):
         "created_by",
         "officer_id",
         "created_at",
-        "updated_at",
+        "last_updated_at",
     ]
     return make_downloadable_csv(
         notes, department_id, "Notes", field_names, descriptions_record_maker
diff --git a/OpenOversight/app/models/database.py b/OpenOversight/app/models/database.py
index 35fd79afc..daf0e6958 100644
--- a/OpenOversight/app/models/database.py
+++ b/OpenOversight/app/models/database.py
@@ -9,8 +9,7 @@
 from flask_login import UserMixin
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import CheckConstraint, UniqueConstraint, func
-from sqlalchemy.ext.declarative import DeclarativeMeta
-from sqlalchemy.orm import validates
+from sqlalchemy.orm import DeclarativeMeta, declarative_mixin, declared_attr, validates
 from sqlalchemy.sql import func as sql_func
 from werkzeug.security import check_password_hash, generate_password_hash
 
@@ -22,6 +21,7 @@
 from OpenOversight.app.utils.choices import GENDER_CHOICES, RACE_CHOICES
 from OpenOversight.app.utils.constants import (
     ENCODING_UTF_8,
+    KEY_DB_CREATOR,
     KEY_DEPT_TOTAL_ASSIGNMENTS,
     KEY_DEPT_TOTAL_INCIDENTS,
     KEY_DEPT_TOTAL_OFFICERS,
@@ -63,22 +63,49 @@
 )
 
 
-class Department(BaseModel):
-    __tablename__ = "departments"
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(255), index=False, unique=False, nullable=False)
-    short_name = db.Column(db.String(100), unique=False, nullable=False)
-    state = db.Column(db.String(2), server_default="", nullable=False)
+@declarative_mixin
+class TrackUpdates:
+    """Add columns to track the date of and user who created and last modified
+    the object.
+    """
+
     created_at = db.Column(
         db.DateTime(timezone=True),
         nullable=False,
         server_default=sql_func.now(),
         unique=False,
     )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
+    last_updated_at = db.Column(
+        db.DateTime(timezone=True),
+        nullable=False,
+        server_default=sql_func.now(),
+        unique=False,
     )
 
+    @declared_attr
+    def created_by(cls):
+        return db.Column(
+            db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
+        )
+
+    @declared_attr
+    def last_updated_by(cls):
+        return db.Column(
+            db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
+        )
+
+    @declared_attr
+    def creator(cls):
+        return db.relationship("User", foreign_keys=[cls.created_by])
+
+
+class Department(BaseModel, TrackUpdates):
+    __tablename__ = "departments"
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(255), index=False, unique=False, nullable=False)
+    short_name = db.Column(db.String(100), unique=False, nullable=False)
+    state = db.Column(db.String(2), server_default="", nullable=False)
+
     # See https://github.com/lucyparsons/OpenOversight/issues/462
     unique_internal_identifier_label = db.Column(
         db.String(100), unique=False, nullable=True
@@ -128,7 +155,7 @@ def remove_database_cache_entries(self, update_types: List[str]) -> None:
         remove_database_cache_entries(self, update_types)
 
 
-class Job(BaseModel):
+class Job(BaseModel, TrackUpdates):
     __tablename__ = "jobs"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -137,15 +164,6 @@ class Job(BaseModel):
     order = db.Column(db.Integer, index=True, unique=False, nullable=False)
     department_id = db.Column(db.Integer, db.ForeignKey("departments.id"))
     department = db.relationship("Department", backref="jobs")
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -160,47 +178,25 @@ def __str__(self):
         return self.job_title
 
 
-class Note(BaseModel):
+class Note(BaseModel, TrackUpdates):
     __tablename__ = "notes"
 
     id = db.Column(db.Integer, primary_key=True)
     text_contents = db.Column(db.Text())
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
-    creator = db.relationship("User", backref="notes")
     officer_id = db.Column(db.Integer, db.ForeignKey("officers.id", ondelete="CASCADE"))
     officer = db.relationship("Officer", back_populates="notes")
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    updated_at = db.Column(db.DateTime(timezone=True), unique=False)
 
 
-class Description(BaseModel):
+class Description(BaseModel, TrackUpdates):
     __tablename__ = "descriptions"
 
-    creator = db.relationship("User", backref="descriptions")
     officer = db.relationship("Officer", back_populates="descriptions")
     id = db.Column(db.Integer, primary_key=True)
     text_contents = db.Column(db.Text())
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
     officer_id = db.Column(db.Integer, db.ForeignKey("officers.id", ondelete="CASCADE"))
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    updated_at = db.Column(db.DateTime(timezone=True), unique=False)
 
 
-class Officer(BaseModel):
+class Officer(BaseModel, TrackUpdates):
     __tablename__ = "officers"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -219,15 +215,6 @@ class Officer(BaseModel):
     unique_internal_identifier = db.Column(
         db.String(50), index=True, unique=True, nullable=True
     )
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
 
     links = db.relationship(
         "Link", secondary=officer_links, backref=db.backref("officers", lazy=True)
@@ -312,7 +299,7 @@ def __repr__(self):
         )
 
 
-class Salary(BaseModel):
+class Salary(BaseModel, TrackUpdates):
     __tablename__ = "salaries"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -322,21 +309,12 @@ class Salary(BaseModel):
     overtime_pay = db.Column(db.Numeric, index=True, unique=False, nullable=True)
     year = db.Column(db.Integer, index=True, unique=False, nullable=False)
     is_fiscal_year = db.Column(db.Boolean, index=False, unique=False, nullable=False)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
 
     def __repr__(self):
         return f"<Salary: ID {self.officer_id} : {self.salary}"
 
 
-class Assignment(BaseModel):
+class Assignment(BaseModel, TrackUpdates):
     __tablename__ = "assignments"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -349,21 +327,12 @@ class Assignment(BaseModel):
     unit = db.relationship("Unit")
     start_date = db.Column(db.Date, index=True, unique=False, nullable=True)
     resign_date = db.Column(db.Date, index=True, unique=False, nullable=True)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
 
     def __repr__(self):
         return f"<Assignment: ID {self.officer_id} : {self.star_no}>"
 
 
-class Unit(BaseModel):
+class Unit(BaseModel, TrackUpdates):
     __tablename__ = "unit_types"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -372,21 +341,12 @@ class Unit(BaseModel):
     department = db.relationship(
         "Department", backref="unit_types", order_by="Unit.description.asc()"
     )
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer, db.ForeignKey("users.id", ondelete="SET NULL"), unique=False
-    )
 
     def __repr__(self):
         return f"Unit: {self.description}"
 
 
-class Face(BaseModel):
+class Face(BaseModel, TrackUpdates):
     __tablename__ = "faces"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -419,16 +379,9 @@ class Face(BaseModel):
     original_image = db.relationship(
         "Image", backref="tags", foreign_keys=[original_image_id], lazy=True
     )
-    created_by = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True)
     featured = db.Column(
         db.Boolean, nullable=False, default=False, server_default="false"
     )
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
 
     __table_args__ = (UniqueConstraint("officer_id", "img_id", name="unique_faces"),)
 
@@ -436,33 +389,19 @@ def __repr__(self):
         return f"<Tag ID {self.id}: {self.officer_id} - {self.img_id}>"
 
 
-class Image(BaseModel):
+class Image(BaseModel, TrackUpdates):
     __tablename__ = "raw_images"
 
     id = db.Column(db.Integer, primary_key=True)
     filepath = db.Column(db.String(255), unique=False)
     hash_img = db.Column(db.String(120), unique=False, nullable=True)
 
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        index=True,
-        unique=False,
-        server_default=sql_func.now(),
-    )
-
     # We might know when the image was taken e.g. through EXIF data
     taken_at = db.Column(
         db.DateTime(timezone=True), index=True, unique=False, nullable=True
     )
     contains_cops = db.Column(db.Boolean, nullable=True)
-    created_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
 
-    user = db.relationship("User", back_populates="classifications")
     is_tagged = db.Column(db.Boolean, default=False, unique=False, nullable=True)
 
     department_id = db.Column(db.Integer, db.ForeignKey("departments.id"))
@@ -525,7 +464,7 @@ def __repr__(self):
 )
 
 
-class Location(BaseModel):
+class Location(BaseModel, TrackUpdates):
     __tablename__ = "locations"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -535,18 +474,6 @@ class Location(BaseModel):
     city = db.Column(db.String(100), unique=False, index=True)
     state = db.Column(db.String(2), unique=False, index=True)
     zip_code = db.Column(db.String(5), unique=False, index=True)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
 
     @validates("zip_code")
     def validate_zip_code(self, key, zip_code):
@@ -580,24 +507,12 @@ def __repr__(self):
             return f"{self.city} {self.state}"
 
 
-class LicensePlate(BaseModel):
+class LicensePlate(BaseModel, TrackUpdates):
     __tablename__ = "license_plates"
 
     id = db.Column(db.Integer, primary_key=True)
     number = db.Column(db.String(8), nullable=False, index=True)
     state = db.Column(db.String(2), index=True)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
 
     # for use if car is federal, diplomat, or other non-state
     # non_state_identifier = db.Column(db.String(20), index=True)
@@ -607,7 +522,7 @@ def validate_state(self, key, state):
         return state_validator(state)
 
 
-class Link(BaseModel):
+class Link(BaseModel, TrackUpdates):
     __tablename__ = "links"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -616,26 +531,13 @@ class Link(BaseModel):
     link_type = db.Column(db.String(100), index=True)
     description = db.Column(db.Text(), nullable=True)
     author = db.Column(db.String(255), nullable=True)
-    created_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
-    creator = db.relationship("User", backref="links", lazy=True)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
 
     @validates("url")
     def validate_url(self, key, url):
         return url_validator(url)
 
 
-class Incident(BaseModel):
+class Incident(BaseModel, TrackUpdates):
     __tablename__ = "incidents"
 
     id = db.Column(db.Integer, primary_key=True)
@@ -665,32 +567,6 @@ class Incident(BaseModel):
     )
     department_id = db.Column(db.Integer, db.ForeignKey("departments.id"))
     department = db.relationship("Department", backref="incidents", lazy=True)
-    created_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=False,
-        server_default=sql_func.now(),
-        unique=False,
-    )
-    created_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
-    creator = db.relationship(
-        "User", backref="incidents_created", lazy=True, foreign_keys=[created_by]
-    )
-    last_updated_by = db.Column(
-        db.Integer,
-        db.ForeignKey("users.id", ondelete="SET NULL"),
-        nullable=True,
-        unique=False,
-    )
-    last_updated_at = db.Column(
-        db.DateTime(timezone=True),
-        nullable=True,
-        unique=False,
-    )
 
 
 class User(UserMixin, BaseModel):
@@ -710,8 +586,29 @@ class User(UserMixin, BaseModel):
     is_disabled = db.Column(db.Boolean, default=False)
     dept_pref = db.Column(db.Integer, db.ForeignKey("departments.id"))
     dept_pref_rel = db.relationship("Department", foreign_keys=[dept_pref])
-    classifications = db.relationship("Image", back_populates="user")
-    tags = db.relationship("Face", backref="user")
+
+    # creator backlinks
+    classifications = db.relationship(
+        "Image", back_populates=KEY_DB_CREATOR, foreign_keys="Image.created_by"
+    )
+    descriptions = db.relationship(
+        "Description",
+        back_populates=KEY_DB_CREATOR,
+        foreign_keys="Description.created_by",
+    )
+    incidents_created = db.relationship(
+        "Incident", back_populates=KEY_DB_CREATOR, foreign_keys="Incident.created_by"
+    )
+    links = db.relationship(
+        "Link", back_populates=KEY_DB_CREATOR, foreign_keys="Link.created_by"
+    )
+    notes = db.relationship(
+        "Note", back_populates=KEY_DB_CREATOR, foreign_keys="Note.created_by"
+    )
+    tags = db.relationship(
+        "Face", back_populates=KEY_DB_CREATOR, foreign_keys="Face.created_by"
+    )
+
     created_at = db.Column(
         db.DateTime(timezone=True),
         nullable=False,
diff --git a/OpenOversight/app/templates/image.html b/OpenOversight/app/templates/image.html
index 6f94df7df..496a96d86 100644
--- a/OpenOversight/app/templates/image.html
+++ b/OpenOversight/app/templates/image.html
@@ -78,7 +78,7 @@ <h3>Classification</h3>
                     <b>Classified by user</b>
                   </td>
                   <td>
-                    <a href="{{ url_for('main.profile', username=image.user.username) }}">{{ image.user.username }}</a>
+                    <a href="{{ url_for('main.profile', username=image.creator.username) }}">{{ image.creator.username }}</a>
                   </td>
                 </tr>
               </tbody>
diff --git a/OpenOversight/app/templates/partials/officer_descriptions.html b/OpenOversight/app/templates/partials/officer_descriptions.html
index 08208d6d4..79d864967 100644
--- a/OpenOversight/app/templates/partials/officer_descriptions.html
+++ b/OpenOversight/app/templates/partials/officer_descriptions.html
@@ -3,11 +3,11 @@ <h3>Descriptions</h3>
   <ul class="list-group">
     {% for description in officer.descriptions %}
       <li class="list-group-item">
-        <em>{{ description.updated_at | local_date }}</em>
+        <em>{{ description.last_updated_at | local_date }}</em>
         <br />
         {{ description.text_contents | markdown }}
         {% if current_user and not current_user.is_anonymous %}<em>{{ description.creator.username }}</em>{% endif %}
-        {% if description.creator_id == current_user.get_id() or
+        {% if description.created_by == current_user.get_id() or
           current_user.is_administrator %}
           <a href="{{ url_for('main.description_api', officer_id=officer.id, obj_id=description.id) + '/edit' }}">
             <span class="sr-only">Edit</span>
diff --git a/OpenOversight/app/templates/partials/officer_notes.html b/OpenOversight/app/templates/partials/officer_notes.html
index 8bbc4a76a..e928c4f20 100644
--- a/OpenOversight/app/templates/partials/officer_notes.html
+++ b/OpenOversight/app/templates/partials/officer_notes.html
@@ -2,11 +2,11 @@ <h3>Notes</h3>
 <ul class="list-group">
   {% for note in officer.notes %}
     <li class="list-group-item">
-      <em>{{ note.updated_at | local_date }}</em>
+      <em>{{ note.last_updated_at | local_date }}</em>
       <br />
       {{ note.text_contents | markdown }}
       <em>{{ note.creator.username }}</em>
-      {% if note.creator_id == current_user.get_id() or current_user.is_administrator %}
+      {% if note.created_by == current_user.get_id() or current_user.is_administrator %}
         <a href="{{ url_for('main.note_api', officer_id=officer.id, obj_id=note.id) + '/edit' }}">
           <span class="sr-only">Edit</span>
           <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
diff --git a/OpenOversight/app/templates/tag.html b/OpenOversight/app/templates/tag.html
index 75ed6cf81..404a6e617 100644
--- a/OpenOversight/app/templates/tag.html
+++ b/OpenOversight/app/templates/tag.html
@@ -98,7 +98,7 @@ <h3>Officer</h3>
                       <b>Tagged by user</b>
                     </td>
                     <td>
-                      <a href="{{ url_for('main.profile', username=face.user.username) }}">{{ face.user.username }}</a>
+                      <a href="{{ url_for('main.profile', username=face.creator.username) }}">{{ face.creator.username }}</a>
                     </td>
                   </tr>
                 </tbody>
diff --git a/OpenOversight/app/utils/constants.py b/OpenOversight/app/utils/constants.py
index fdd829683..79a2164da 100644
--- a/OpenOversight/app/utils/constants.py
+++ b/OpenOversight/app/utils/constants.py
@@ -12,6 +12,9 @@
 KEY_DEPT_TOTAL_INCIDENTS = "total_department_incidents"
 KEY_DEPT_TOTAL_OFFICERS = "total_department_officers"
 
+# Database Key Constants
+KEY_DB_CREATOR = "creator"
+
 # Config Key Constants
 KEY_ALLOWED_EXTENSIONS = "ALLOWED_EXTENSIONS"
 KEY_DATABASE_URI = "SQLALCHEMY_DATABASE_URI"
diff --git a/OpenOversight/app/utils/db.py b/OpenOversight/app/utils/db.py
index 0d99cced6..ca052ba69 100644
--- a/OpenOversight/app/utils/db.py
+++ b/OpenOversight/app/utils/db.py
@@ -35,7 +35,7 @@ def compute_leaderboard_stats(select_top=25):
     top_sorters = (
         db.session.query(User, func.count(Image.created_by))
         .select_from(Image)
-        .join(User)
+        .join(User, Image.created_by == User.id)
         .group_by(User)
         .order_by(func.count(Image.created_by).desc())
         .limit(select_top)
@@ -44,7 +44,7 @@ def compute_leaderboard_stats(select_top=25):
     top_taggers = (
         db.session.query(User, func.count(Face.created_by))
         .select_from(Face)
-        .join(User)
+        .join(User, Face.created_by == User.id)
         .group_by(User)
         .order_by(func.count(Face.created_by).desc())
         .limit(select_top)
diff --git a/OpenOversight/app/utils/forms.py b/OpenOversight/app/utils/forms.py
index 68d1c0840..5832d49f9 100644
--- a/OpenOversight/app/utils/forms.py
+++ b/OpenOversight/app/utils/forms.py
@@ -49,7 +49,6 @@ def add_new_assignment(officer_id: int, form: AssignmentForm, current_user: User
         unit_id=unit_id,
         start_date=form.start_date.data,
         resign_date=form.resign_date.data,
-        created_by=current_user.get_id(),
     )
     db.session.add(new_assignment)
     db.session.commit()
@@ -66,7 +65,6 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
         birth_year=form.birth_year.data,
         employment_date=form.employment_date.data,
         department_id=form.department.data.id,
-        created_by=current_user.get_id(),
     )
     db.session.add(officer)
     db.session.commit()
@@ -82,7 +80,6 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
         job_id=form.job_id.data,
         unit=officer_unit,
         start_date=form.employment_date.data,
-        created_by=current_user.get_id(),
     )
     db.session.add(assignment)
     if form.links.data:
@@ -100,9 +97,6 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
                     note=note["text_contents"],
                     user_id=current_user.get_id(),
                     officer=officer,
-                    created_at=datetime.datetime.now(),
-                    updated_at=datetime.datetime.now(),
-                    created_by=current_user.get_id(),
                 )
                 db.session.add(new_note)
     if form.descriptions.data:
@@ -113,9 +107,6 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
                     description=description["text_contents"],
                     user_id=current_user.get_id(),
                     officer=officer,
-                    created_at=datetime.datetime.now(),
-                    updated_at=datetime.datetime.now(),
-                    created_by=current_user.get_id(),
                 )
                 db.session.add(new_description)
     if form.salaries.data:
@@ -128,7 +119,6 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
                     overtime_pay=salary["overtime_pay"],
                     year=salary["year"],
                     is_fiscal_year=salary["is_fiscal_year"],
-                    created_by=current_user.get_id(),
                 )
                 db.session.add(new_salary)
 
@@ -139,10 +129,7 @@ def add_officer_profile(form: AddOfficerForm, current_user: User):
 def create_description(self, form: TextForm, current_user: User):
     return Description(
         text_contents=form.text_contents.data,
-        created_by=current_user.get_id(),
         officer_id=form.officer_id.data,
-        created_at=datetime.datetime.now(),
-        updated_at=datetime.datetime.now(),
     )
 
 
@@ -157,8 +144,6 @@ def if_exists_or_none(val: Union[str, Any]):
         "license_plates": [],
         "links": [],
         "address": "",
-        "created_by": current_user.get_id(),
-        "last_updated_by": current_user.get_id(),
     }
 
     if "address" in form.data:
@@ -173,7 +158,6 @@ def if_exists_or_none(val: Union[str, Any]):
         ).first()
         if not location:
             location = Location(
-                created_by=current_user.get_id(),
                 cross_street1=if_exists_or_none(address["cross_street1"]),
                 cross_street2=if_exists_or_none(address["cross_street2"]),
                 city=if_exists_or_none(address["city"]),
@@ -199,7 +183,6 @@ def if_exists_or_none(val: Union[str, Any]):
                 ).first()
                 if not pl:
                     pl = LicensePlate(
-                        created_by=current_user.get_id(),
                         number=if_exists_or_none(plate["number"]),
                         state=if_exists_or_none(plate["state"]),
                     )
@@ -219,7 +202,6 @@ def if_exists_or_none(val: Union[str, Any]):
                 if not li:
                     li = Link(
                         author=if_exists_or_none(link["author"]),
-                        created_by=current_user.get_id(),
                         description=if_exists_or_none(link["description"]),
                         link_type=if_exists_or_none(link["link_type"]),
                         title=if_exists_or_none(link["title"]),
@@ -238,19 +220,13 @@ def if_exists_or_none(val: Union[str, Any]):
         report_number=form.data["report_number"],
         license_plates=fields["license_plates"],
         links=fields["links"],
-        created_by=current_user.get_id(),
-        last_updated_by=current_user.get_id(),
-        last_updated_at=datetime.datetime.now(),
     )
 
 
 def create_note(self, form: TextForm, current_user: User):
     return Note(
         text_contents=form.text_contents.data,
-        created_by=current_user.get_id(),
         officer_id=form.officer_id.data,
-        created_at=datetime.datetime.now(),
-        updated_at=datetime.datetime.now(),
     )
 
 
diff --git a/OpenOversight/migrations/versions/2023-08-21-0300_a35aa1a114fa_add_create_and_last_update_columns.py b/OpenOversight/migrations/versions/2023-08-21-0300_a35aa1a114fa_add_create_and_last_update_columns.py
new file mode 100644
index 000000000..af34e5555
--- /dev/null
+++ b/OpenOversight/migrations/versions/2023-08-21-0300_a35aa1a114fa_add_create_and_last_update_columns.py
@@ -0,0 +1,332 @@
+"""Add create and last_update columns
+
+Revision ID: a35aa1a114fa
+Revises: b38c133bed3c
+Create Date: 2023-08-21 03:00:57.468190
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision = "a35aa1a114fa"
+down_revision = "b38c133bed3c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("assignments", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "assignments_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("departments", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "departments_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("descriptions", schema=None) as batch_op:
+        batch_op.alter_column("updated_at", new_column_name="last_updated_at")
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+
+    with op.batch_alter_table("faces", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.drop_constraint("faces_created_by_fkey", type_="foreignkey")
+        batch_op.create_foreign_key(
+            "faces_created_by_users_fkey",
+            "users",
+            ["created_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+        batch_op.create_foreign_key(
+            "faces_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("jobs", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "jobs_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("license_plates", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "licence_plates_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("links", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "links_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("locations", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "locations_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("notes", schema=None) as batch_op:
+        batch_op.alter_column("updated_at", new_column_name="last_updated_at")
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+
+    with op.batch_alter_table("officers", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "officers_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("raw_images", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.alter_column(
+            "created_at",
+            existing_type=postgresql.TIMESTAMP(timezone=True),
+            nullable=False,
+            existing_server_default=sa.text("now()"),
+        )
+        batch_op.drop_index("ix_raw_images_created_at")
+        batch_op.create_foreign_key(
+            "raw_images_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("salaries", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "salaries_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("unit_types", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "last_updated_at",
+                sa.DateTime(timezone=True),
+                server_default=sa.text("now()"),
+                nullable=True,
+            )
+        )
+        batch_op.add_column(sa.Column("last_updated_by", sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(
+            "unit_types_last_updated_by_users_fkey",
+            "users",
+            ["last_updated_by"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+
+def downgrade():
+    with op.batch_alter_table("unit_types", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "unit_types_last_updated_by_users", type_="_fkeyforeignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("salaries", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "salaries_last_updated_by_users", type_="_fkeyforeignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("raw_images", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "raw_images_last_updated_by_users", type_="_fkeyforeignkey"
+        )
+        batch_op.create_index("ix_raw_images_created_at", ["created_at"], unique=False)
+        batch_op.alter_column(
+            "created_at",
+            existing_type=postgresql.TIMESTAMP(timezone=True),
+            nullable=True,
+            existing_server_default=sa.text("now()"),
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("officers", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "officers_last_updated_by_users", type_="_fkeyforeignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("notes", schema=None) as batch_op:
+        batch_op.alter_column("last_updated_at", new_column_name="updated_at")
+        batch_op.drop_column("last_updated_by")
+
+    with op.batch_alter_table("locations", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "locations_last_updated_by_users", type_="_fkeyforeignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("links", schema=None) as batch_op:
+        batch_op.drop_constraint("links_last_updated_by_users_fkey", type_="foreignkey")
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("license_plates", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "licence_plates_last_updated_by_users_fkey", type_="foreignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("jobs", schema=None) as batch_op:
+        batch_op.drop_constraint("jobs_last_updated_by_users_fkey", type_="foreignkey")
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("faces", schema=None) as batch_op:
+        batch_op.drop_constraint("faces_last_updated_by_users_fkey", type_="foreignkey")
+        batch_op.drop_constraint("faces_created_by_users_fkey", type_="foreignkey")
+        batch_op.create_foreign_key(
+            "faces_created_by_fkey", "users", ["created_by"], ["id"]
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("descriptions", schema=None) as batch_op:
+        batch_op.alter_column("last_updated_at", new_column_name="updated_at")
+        batch_op.drop_column("last_updated_by")
+
+    with op.batch_alter_table("departments", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "departments_last_updated_by_users_fkey", type_="foreignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
+
+    with op.batch_alter_table("assignments", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "assignments_last_updated_by_users_fkey", type_="foreignkey"
+        )
+        batch_op.drop_column("last_updated_by")
+        batch_op.drop_column("last_updated_at")
diff --git a/OpenOversight/tests/conftest.py b/OpenOversight/tests/conftest.py
index 292e70de9..504492c52 100644
--- a/OpenOversight/tests/conftest.py
+++ b/OpenOversight/tests/conftest.py
@@ -229,7 +229,7 @@ def build_note(officer: Officer, user: User, content=None) -> Note:
         officer_id=officer.id,
         created_by=user.id,
         created_at=date,
-        updated_at=date,
+        last_updated_at=date,
     )
 
 
@@ -242,7 +242,7 @@ def build_description(officer: Officer, user: User, content=None) -> Description
         officer_id=officer.id,
         created_by=user.id,
         created_at=date,
-        updated_at=date,
+        last_updated_at=date,
     )
 
 
diff --git a/OpenOversight/tests/routes/test_descriptions.py b/OpenOversight/tests/routes/test_descriptions.py
index 4ee81ec80..7d8569f80 100644
--- a/OpenOversight/tests/routes/test_descriptions.py
+++ b/OpenOversight/tests/routes/test_descriptions.py
@@ -70,7 +70,7 @@ def test_admins_cannot_inject_unsafe_html(mockdata, client, session):
 
 def test_admins_can_create_descriptions(mockdata, client, session):
     with current_app.test_request_context():
-        login_admin(client)
+        rv, admin = login_admin(client)
         officer = Officer.query.first()
         text_contents = "I can haz descriptionz"
         form = TextForm(text_contents=text_contents, officer_id=officer.id)
@@ -89,11 +89,13 @@ def test_admins_can_create_descriptions(mockdata, client, session):
         ).first()
         assert created_description is not None
         assert created_description.created_at is not None
+        assert created_description.created_by == admin.id
+        assert created_description.last_updated_by == admin.id
 
 
 def test_acs_can_create_descriptions(mockdata, client, session):
     with current_app.test_request_context():
-        login_ac(client)
+        rv, ac = login_ac(client)
         officer = Officer.query.first()
         description = "A description"
         form = TextForm(text_contents=description, officer_id=officer.id)
@@ -112,11 +114,14 @@ def test_acs_can_create_descriptions(mockdata, client, session):
         ).first()
         assert created_description is not None
         assert created_description.created_at is not None
+        assert created_description.created_by == ac.id
+        assert created_description.last_updated_by == ac.id
 
 
 def test_admins_can_edit_descriptions(mockdata, client, session):
     with current_app.test_request_context():
-        login_admin(client)
+        rv, admin = login_admin(client)
+        ac = User.query.filter_by(ac_department_id=AC_DEPT).first()
         officer = Officer.query.first()
         old_description = "meow"
         new_description = "I can haz editing descriptionz"
@@ -124,7 +129,10 @@ def test_admins_can_edit_descriptions(mockdata, client, session):
         description = Description(
             text_contents=old_description,
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
+            created_by=ac.id,
+            last_updated_by=ac.id,
         )
         db.session.add(description)
         db.session.commit()
@@ -145,20 +153,27 @@ def test_admins_can_edit_descriptions(mockdata, client, session):
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert description.text_contents == new_description
-        assert description.updated_at > original_date
+        assert description.created_at == original_date
+        assert description.last_updated_at > original_date
+        assert description.created_by == ac.id
+        assert description.last_updated_by == admin.id
 
 
 def test_ac_can_edit_their_descriptions_in_their_department(mockdata, client, session):
     with current_app.test_request_context():
-        login_ac(client)
+        rv, ac = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        user = User.query.first()
         old_description = "meow"
         new_description = "I can haz editing descriptionz"
         original_date = datetime.now()
         description = Description(
             text_contents=old_description,
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
+            created_by=user.id,
+            last_updated_by=user.id,
         )
         db.session.add(description)
         db.session.commit()
@@ -179,20 +194,27 @@ def test_ac_can_edit_their_descriptions_in_their_department(mockdata, client, se
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert description.text_contents == new_description
-        assert description.updated_at > original_date
+        assert description.created_at == original_date
+        assert description.last_updated_at > original_date
+        assert description.created_by == user.id
+        assert description.last_updated_by == ac.id
 
 
 def test_ac_can_edit_others_descriptions(mockdata, client, session):
     with current_app.test_request_context():
-        login_ac(client)
+        rv, ac = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        user = User.query.first()
         old_description = "meow"
         new_description = "I can haz editing descriptionz"
         original_date = datetime.now()
         description = Description(
             text_contents=old_description,
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
+            created_by=user.id,
+            last_updated_by=user.id,
         )
         db.session.add(description)
         db.session.commit()
@@ -213,7 +235,9 @@ def test_ac_can_edit_others_descriptions(mockdata, client, session):
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert description.text_contents == new_description
-        assert description.updated_at > original_date
+        assert description.last_updated_at > original_date
+        assert description.created_by == user.id
+        assert description.last_updated_by == ac.id
 
 
 def test_ac_cannot_edit_descriptions_not_in_their_department(mockdata, client, session):
@@ -229,7 +253,8 @@ def test_ac_cannot_edit_descriptions_not_in_their_department(mockdata, client, s
         description = Description(
             text_contents=old_description,
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
         )
         db.session.add(description)
         db.session.commit()
@@ -274,10 +299,12 @@ def test_acs_can_delete_their_descriptions_in_their_department(
     with current_app.test_request_context():
         login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        now = datetime.now()
         description = Description(
             text_contents="Hello",
             officer_id=officer.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
         )
         db.session.add(description)
         db.session.commit()
@@ -302,10 +329,12 @@ def test_acs_cannot_delete_descriptions_not_in_their_department(
         officer = Officer.query.except_(
             Officer.query.filter_by(department_id=AC_DEPT)
         ).first()
+        now = datetime.now()
         description = Description(
             text_contents="Hello",
             officer_id=officer.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
         )
         db.session.add(description)
         db.session.commit()
@@ -330,7 +359,6 @@ def test_acs_can_get_edit_form_for_their_dept(mockdata, client, session):
         description = Description(
             text_contents="Hello",
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -353,7 +381,7 @@ def test_acs_can_get_others_edit_form(mockdata, client, session):
             text_contents="Hello",
             officer_id=officer.id,
             created_by=user.id - 1,
-            updated_at=datetime.now(),
+            last_updated_by=user.id - 1,
         )
         db.session.add(description)
         db.session.commit()
@@ -377,7 +405,6 @@ def test_acs_cannot_get_edit_form_for_their_non_dept(mockdata, client, session):
         description = Description(
             text_contents="Hello",
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -398,7 +425,6 @@ def test_users_can_see_descriptions(mockdata, client, session):
         description = Description(
             text_contents=text_contents,
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -420,7 +446,6 @@ def test_admins_can_see_descriptions(mockdata, client, session):
         description = Description(
             text_contents=text_contents,
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -441,7 +466,6 @@ def test_acs_can_see_descriptions_in_their_department(mockdata, client, session)
         description = Description(
             text_contents=text_contents,
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -465,7 +489,6 @@ def test_acs_can_see_descriptions_not_in_their_department(mockdata, client, sess
         description = Description(
             text_contents=text_contents,
             officer_id=officer.id,
-            updated_at=datetime.now(),
         )
         db.session.add(description)
         db.session.commit()
@@ -489,7 +512,8 @@ def test_anonymous_users_cannot_see_description_creators(mockdata, client, sessi
         description = Description(
             text_contents=text_contents,
             officer_id=officer.id,
-            updated_at=datetime.now(),
+            created_by=ac.id,
+            last_updated_by=ac.id,
         )
         db.session.add(description)
         db.session.commit()
diff --git a/OpenOversight/tests/routes/test_notes.py b/OpenOversight/tests/routes/test_notes.py
index 7774d8ad8..864a500ea 100644
--- a/OpenOversight/tests/routes/test_notes.py
+++ b/OpenOversight/tests/routes/test_notes.py
@@ -120,7 +120,8 @@ def test_admins_can_edit_notes(mockdata, client, session, faker):
         note = Note(
             text_contents=faker.sentence(nb_words=15),
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
         )
         db.session.add(note)
         db.session.commit()
@@ -142,7 +143,7 @@ def test_admins_can_edit_notes(mockdata, client, session, faker):
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert note.text_contents == new_note
-        assert note.updated_at > original_date
+        assert note.last_updated_at > original_date
         assert has_database_cache_entry(*cache_params) is False
 
 
@@ -155,7 +156,8 @@ def test_ac_can_edit_their_notes_in_their_department(mockdata, client, session,
         note = Note(
             text_contents=faker.sentence(nb_words=15),
             officer_id=officer.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
         )
         db.session.add(note)
         db.session.commit()
@@ -173,7 +175,7 @@ def test_ac_can_edit_their_notes_in_their_department(mockdata, client, session,
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert note.text_contents == new_note
-        assert note.updated_at > original_date
+        assert note.last_updated_at > original_date
 
 
 def test_ac_can_edit_others_notes(mockdata, client, session):
@@ -187,7 +189,9 @@ def test_ac_can_edit_others_notes(mockdata, client, session):
             text_contents=old_note,
             officer_id=officer.id,
             created_by=user.id - 1,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
+            last_updated_by=user.id - 1,
         )
         db.session.add(note)
         db.session.commit()
@@ -205,7 +209,7 @@ def test_ac_can_edit_others_notes(mockdata, client, session):
         assert "updated" in rv.data.decode(ENCODING_UTF_8)
 
         assert note.text_contents == new_note
-        assert note.updated_at > original_date
+        assert note.last_updated_at > original_date
 
 
 def test_ac_cannot_edit_notes_not_in_their_department(mockdata, client, session):
@@ -222,7 +226,9 @@ def test_ac_cannot_edit_notes_not_in_their_department(mockdata, client, session)
             text_contents=old_note,
             officer_id=officer.id,
             created_by=user.id,
-            updated_at=original_date,
+            created_at=original_date,
+            last_updated_at=original_date,
+            last_updated_by=user.id,
         )
         db.session.add(note)
         db.session.commit()
@@ -264,11 +270,14 @@ def test_acs_can_delete_their_notes_in_their_department(mockdata, client, sessio
     with current_app.test_request_context():
         _, user = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        now = datetime.now()
         note = Note(
             text_contents="Hello",
             officer_id=officer.id,
             created_by=user.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=user.id,
         )
         db.session.add(note)
         db.session.commit()
@@ -289,11 +298,14 @@ def test_acs_cannot_delete_notes_not_in_their_department(
         officer = Officer.query.except_(
             Officer.query.filter_by(department_id=AC_DEPT)
         ).first()
+        now = datetime.now()
         note = Note(
             text_contents=faker.sentence(nb_words=20),
             officer_id=officer.id,
             created_by=2,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=2,
         )
         db.session.add(note)
         db.session.commit()
@@ -311,11 +323,14 @@ def test_acs_can_get_edit_form_for_their_dept(mockdata, client, session):
     with current_app.test_request_context():
         _, user = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        now = datetime.now()
         note = Note(
             text_contents="Hello",
             officer_id=officer.id,
             created_by=user.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=user.id,
         )
         db.session.add(note)
         db.session.commit()
@@ -331,11 +346,14 @@ def test_acs_can_get_others_edit_form(mockdata, client, session):
     with current_app.test_request_context():
         _, user = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
+        now = datetime.now()
         note = Note(
             text_contents="Hello",
             officer_id=officer.id,
             created_by=user.id - 1,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=user.id - 1,
         )
         db.session.add(note)
         db.session.commit()
@@ -353,11 +371,14 @@ def test_acs_cannot_get_edit_form_for_their_non_dept(mockdata, client, session):
         officer = Officer.query.except_(
             Officer.query.filter_by(department_id=AC_DEPT)
         ).first()
+        now = datetime.now()
         note = Note(
             text_contents="Hello",
             officer_id=officer.id,
             created_by=2,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=2,
         )
         db.session.add(note)
         db.session.commit()
@@ -372,11 +393,14 @@ def test_users_cannot_see_notes(mockdata, client, session, faker):
     with current_app.test_request_context():
         officer = Officer.query.first()
         text_contents = faker.sentence(nb_words=20)
+        now = datetime.now()
         note = Note(
             text_contents=text_contents,
             officer_id=officer.id,
             created_by=1,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=1,
         )
         db.session.add(note)
         db.session.commit()
@@ -395,11 +419,14 @@ def test_admins_can_see_notes(mockdata, client, session):
         _, user = login_admin(client)
         officer = Officer.query.first()
         text_contents = "Kittens see everything"
+        now = datetime.now()
         note = Note(
             text_contents=text_contents,
             officer_id=officer.id,
             created_by=user.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=user.id,
         )
         db.session.add(note)
         db.session.commit()
@@ -417,11 +444,14 @@ def test_acs_can_see_notes_in_their_department(mockdata, client, session):
         _, user = login_ac(client)
         officer = Officer.query.filter_by(department_id=AC_DEPT).first()
         text_contents = "I can haz notez"
+        now = datetime.now()
         note = Note(
             text_contents=text_contents,
             officer_id=officer.id,
             created_by=user.id,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=user.id,
         )
         db.session.add(note)
         db.session.commit()
@@ -441,11 +471,14 @@ def test_acs_cannot_see_notes_not_in_their_department(mockdata, client, session)
             Officer.query.filter_by(department_id=AC_DEPT)
         ).first()
         text_contents = "Hello it me"
+        now = datetime.now()
         note = Note(
             text_contents=text_contents,
             officer_id=officer.id,
             created_by=1,
-            updated_at=datetime.now(),
+            created_at=now,
+            last_updated_at=now,
+            last_updated_by=1,
         )
         db.session.add(note)
         db.session.commit()