diff --git a/src/hooks/forgejo.rs b/src/hooks/forgejo.rs
index 9a32686..d1defc3 100644
--- a/src/hooks/forgejo.rs
+++ b/src/hooks/forgejo.rs
@@ -38,7 +38,11 @@ impl From<FjIssue> for Issue {
 			action: Some(other.action.into()),
 			title: other.issue.title,
 			author: User {
-				name: other.issue.user.login,
+				name: other
+					.comment
+					.as_ref()
+					.map(|c| c.user.login.clone())
+					.unwrap_or(other.issue.user.login),
 			},
 			repository: Repository {
 				name: other.repository.name,
@@ -60,7 +64,11 @@ impl From<FjIssue> for Note {
 			merge_request: None,
 			snippet: false,
 			author: User {
-				name: other.issue.user.login,
+				name: other
+					.comment
+					.as_ref()
+					.map(|c| c.user.login.clone())
+					.unwrap_or(other.issue.user.login),
 			},
 			repository: Repository {
 				name: other.repository.name,