diff --git a/nateman/templates/klausuren/edit.html.j2 b/nateman/templates/klausuren/edit.html.j2
index 7a32246..80c369f 100644
--- a/nateman/templates/klausuren/edit.html.j2
+++ b/nateman/templates/klausuren/edit.html.j2
@@ -20,12 +20,10 @@
 {% extends 'base.html.j2' %}
 
 {% block title %}
-  Klausur: {{ klausur.kursname }}
-  ({{ macros.date(klausur.date, tag=false) }}; {{ klausur.lehrer.kuerzel }}, {{ klausur.stufe.name }})
+  Klausur: {{ macros.klausur_name(klausur, time_tag=false) }}
 {% endblock %}
 {% block header %}
-  Klausur: {{ klausur.kursname }}
-  ({{ macros.date(klausur.date) }}; {{ klausur.lehrer.kuerzel }}, {{ klausur.stufe.name }})
+  Klausur: {{ macros.klausur_name(klausur) }}
 {% endblock %}
 
 {# klausur #}
diff --git a/nateman/templates/macros.j2 b/nateman/templates/macros.j2
index d217e69..fea9abb 100644
--- a/nateman/templates/macros.j2
+++ b/nateman/templates/macros.j2
@@ -28,4 +28,8 @@
   {%- if klausur.startperiod != klausur.endperiod -%}
     –{{ klausur.endperiod }}.
   {%- endif %}
+{%- endmacro %}
+
+{% macro klausur_name(klausur, time_tag=true) -%}
+  {{ klausur.kursname }} ({{ date(klausur.date, time_tag) }}; {{ klausur.lehrer.kuerzel }}, {{ klausur.stufe.name }})
 {%- endmacro %}
\ No newline at end of file