diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
index 11d03c318..20955df33 100644
--- a/lib/Activity/ActivityManager.php
+++ b/lib/Activity/ActivityManager.php
@@ -404,13 +404,12 @@ class ActivityManager {
 			$subjectParams['stack'] = $this->stackMapper->find($additionalParams['after']);
 		}
 
-		$subjectParams['author'] = $this->userId;
-
+		$subjectParams['author'] = $author === null ? $this->userId : $author;
 
 		$event = $this->manager->generateEvent();
 		$event->setApp('deck')
 			->setType($eventType)
-			->setAuthor($author === null ? $this->userId : $author)
+			->setAuthor($subjectParams['author'])
 			->setObject($objectType, (int)$object->getId(), $object->getTitle())
 			->setSubject($subject, array_merge($subjectParams, $additionalParams))
 			->setTimestamp(time());