diff --git a/startup/event_handlers.py b/startup/event_handlers.py
index f0323ea..b04b588 100644
--- a/startup/event_handlers.py
+++ b/startup/event_handlers.py
@@ -70,6 +70,6 @@
 
 def comment_added(doc):
 	"""add comment to feed"""
-	home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
-		'<i>"' + doc.comment + '"</i>', '#6B24B3')
+	home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, 
+		doc.comment_by or doc.owner, '<i>"' + doc.comment + '"</i>', '#6B24B3')