diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 91bd7719c86b5ae5fda50c757bd0a2b3e9af60a0..7a7c72b99efa204b0fac0d67031a938f904a554d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
+Unreleased
+----------
+
+Fixed
+~~~~~
+
+* Fix problems with displaying dates for events in the week and lesson view.
+
`2.0rc5`_ - 2021-08-12
----------------------
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 0845ecc51c69579a63b716be947de8ca05dfd1ff..7c27f555b113da2e420ad9455ec0b9bfe6e9acf6 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -179,12 +179,11 @@
{% with absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses extra_marks=prev_lesson.get_extra_marks %}
{% has_perm "alsijil.view_lessondocumentation_rule" user prev_lesson as can_view_prev_lesson_documentation %}
{% if prev_doc and can_view_prev_lesson_documentation %}
- {% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
<div class="col s12" id="previous-lesson">
<div class="card">
<div class="card-content">
<span class="card-title">
- {% blocktrans %}Overview: Previous lesson{% endblocktrans %} ({{ prev_date }},
+ {% blocktrans %}Overview: Previous lesson{% endblocktrans %} ({{ prev_doc.date_formatted }},
{% blocktrans with period=prev_lesson.period.period %}{{ period }}. period{% endblocktrans %})
</span>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index 82d9fb4b987e8c920cf5768a69bd0d6acd07e83a..1cdab7ff87800a30797da5c8d8c346c919ffecd9 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -353,10 +353,9 @@
{% for note in person.personal_notes %}
<blockquote>
{{ note.remarks }}
- {% weekday_to_date week note.register_object.period.weekday as note_date %}
<em class="right">
<a href="{{ note.register_object.alsijil_url }}">
- {{ note.date }}, {{ note.register_object.get_subject.name }}
+ {{ note.date_formatted }}, {{ note.register_object.get_subject.name }}
</a>
</em>
</blockquote>