diff --git a/_layouts/course.html b/_layouts/course.html
index 53c70c703e97c9471794eb271d75b1f7679f7aa9..c20275a89feead8072bf6418d9bdaf1a6aec4d2f 100644
--- a/_layouts/course.html
+++ b/_layouts/course.html
@@ -7,7 +7,8 @@ layout: default
     <div class="card">
       <div class="card-content">
         <span class="card-title">{{page.title}} ({{page.taught}})</span>
-        <p>{{page.instructor}}</p>
+        {% assign person = page.instructor %}
+        Instructor: {% include people_chip.html person=person %}
       </div>
     </div>
   </div>
diff --git a/teaching/AIProj.md b/teaching/AIProj.md
index d5c858af142d9772796ce4c0e62e000eebec92a2..ddaf9fd8dd59db1efa4b277eddf74037d4a87711 100644
--- a/teaching/AIProj.md
+++ b/teaching/AIProj.md
@@ -1,6 +1,6 @@
 ---
 layout: course
-instructor: Prof. Dr. Michael Kohlhase
+instructor: mkohlhase
 title: Projekt zur Künstlichen Intelligenz
 menu_title: KI-Projekt
 taught: WS16/17, SS16
diff --git a/teaching/KRMT.md b/teaching/KRMT.md
index 7c617c72d0fee1655ec8036b2a3848e965035724..e4502ee8e436dc939df1866c34701120e7199013 100644
--- a/teaching/KRMT.md
+++ b/teaching/KRMT.md
@@ -1,6 +1,6 @@
 ---
 layout: course
-instructor: Prof. Dr. Michael Kohlhase
+instructor: mkohlhase
 title: Vorlesung *Logik-Basierte Wissensrepräsentation für Mathematisch/Technisches Wissen*
 menu_title: Vorlesung KRMT
 taught: SS16/17
diff --git a/teaching/ai1.md b/teaching/ai1.md
index 99a6978b165369df467ad67150a160fe41e8fcad..df57c14db5224fdae3df21f28a38120ae5f8482b 100644
--- a/teaching/ai1.md
+++ b/teaching/ai1.md
@@ -1,6 +1,6 @@
 ---
 layout: course
-instructor: Prof. Dr. Michael Kohlhase
+instructor: mkohlhase
 title: Künstliche Intelligenz I
 menu_title: Künstliche Intelligenz I
 taught: WS16
diff --git a/teaching/ai2.md b/teaching/ai2.md
index fbc61abc6cc8c77483d03048e4a02ca810cb166c..174c4e9ed2e9f773dd207821a08a66449868fb41 100644
--- a/teaching/ai2.md
+++ b/teaching/ai2.md
@@ -1,6 +1,6 @@
 ---
 layout: course
-instructor: Prof. Dr. Michael Kohlhase
+instructor: mkohlhase
 title: Künstliche Intelligenz II
 menu_title: Künstliche Intelligenz II
 taught: SS16/17
diff --git a/teaching/wuv.md b/teaching/wuv.md
index dc2967711d928c1e62308a3486d45740034d8b1b..4d3dce0ba72873b5e6357e0749df6bc7ab4e1c25 100644
--- a/teaching/wuv.md
+++ b/teaching/wuv.md
@@ -1,6 +1,6 @@
 ---
 layout: course
-instructor: Prof. Dr. Michael Kohlhase
+instructor: mkohlhase
 title: Seminar Wissensrepräsentation und -verarbeitung
 menu_title: Seminar WuV
 ---