diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 0bdc154c..52359313 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -37,7 +37,12 @@
                         {% if change.value %}<u>{% else %}<em>{% endif %}{{ change.title }}{% if change.value %}</u>:{% else %}</em>{% endif %}
                         {{ change.value }}
                     </td>
-                    <td class="text-muted"><i class="glyphicon glyphicon-time" data-toggle="tooltip" data-placement="left" title="{{ change.created }}"></i></td>
+                    <td class="text-muted">
+                        {% if change.author and change.author != changeset.author %}
+                            <i class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="left" title="{{ change.author.username }}"></i>
+                        {% endif %}
+                        <i class="glyphicon glyphicon-time" data-toggle="tooltip" data-placement="left" title="{{ change.created }}"></i>
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>