diff --git a/generic/models.py b/generic/models.py
index e265e8cd..109eef4a 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -140,10 +140,16 @@ class QuestionNote(models.Model):
     #    return reverse('rapids:question_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return "{}: {} [{}] {} / {}".format(self.content_type, self.author, self.created_on, self.note_type, self.note)
+        return "{}: {} [{}] {} / {}".format(self.content_type, self.get_author_str(), self.created_on, self.note_type, self.note)
 
     def get_absolute_url(self):
         return "/"
 
     def get_object_url(self):
-        return self.question.get_absolute_url()
\ No newline at end of file
+        return self.question.get_absolute_url()
+
+    def get_author_str(self):
+        if self.user_author is not None:
+            return self.user_author.username
+        else:
+            return self.author
\ No newline at end of file