diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja
index b089e6f1..9b80efe4 100644
--- a/pedagogy/templates/pedagogy/uv_detail.jinja
+++ b/pedagogy/templates/pedagogy/uv_detail.jinja
@@ -21,6 +21,7 @@
 			<p>{{ comment.grade_work_load }}</p>
 			<p>{{ comment.comment }}</p>
 			<p>{% trans %}Published: {% endtrans %}{{ comment.publish_date }}</p>
+			<p>{% trans %}Author: {% endtrans %}{{ comment.author }}</p>
 			{% if user.is_owner(comment) %}
 				<p><a href="{{ url('pedagogy:comment_edit', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a></p>
 				<p><a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a></p>
diff --git a/pedagogy/views.py b/pedagogy/views.py
index f545e4e0..e9fb709f 100644
--- a/pedagogy/views.py
+++ b/pedagogy/views.py
@@ -110,8 +110,9 @@ class UVCommentUpdateView(CanEditPropMixin, UpdateView):
 
     def get_form_kwargs(self):
         kwargs = super(UVCommentUpdateView, self).get_form_kwargs()
-        kwargs["author_id"] = self.request.user.id
-        kwargs["uv_id"] = self.get_object().uv.id
+        obj = self.get_object()
+        kwargs["author_id"] = obj.author.id
+        kwargs["uv_id"] = obj.uv.id
 
         return kwargs