diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
index 66cbd22bd..4e1a7d0fb 100644
--- a/lib/Activity/ActivityManager.php
+++ b/lib/Activity/ActivityManager.php
@@ -144,9 +144,9 @@ public function getActivityFormat($language, $subjectIdentifier, $subjectParams
 				break;
 			case self::SUBJECT_BOARD_UPDATE_ARCHIVED:
 				if (isset($subjectParams['after']) && $subjectParams['after']) {
-					$subject = $ownActivity ? $l->t('You have archived the board {board}') : $l->t('{user} has archived the board {before}');
+					$subject = $ownActivity ? $l->t('You have archived the board {board}') : $l->t('{user} has archived the board {board}');
 				} else {
-					$subject = $ownActivity ? $l->t('You have unarchived the board {board}') : $l->t('{user} has unarchived the board {before}');
+					$subject = $ownActivity ? $l->t('You have unarchived the board {board}') : $l->t('{user} has unarchived the board {board}');
 				}
 				break;
 			case self::SUBJECT_STACK_CREATE:
diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index f18842f48..ba06afecd 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -344,14 +344,14 @@ private function parseParamForChanges($subjectParams, $params, $event) {
 			$params['before'] = [
 				'type' => 'highlight',
 				'id' => (string)$subjectParams['before'],
-				'name' => $subjectParams['before'] ?? ''
+				'name' => (string)$subjectParams['before'] ?? ''
 			];
 		}
 		if (array_key_exists('after', $subjectParams)) {
 			$params['after'] = [
 				'type' => 'highlight',
 				'id' => (string)$subjectParams['after'],
-				'name' => $subjectParams['after'] ?? ''
+				'name' => (string)$subjectParams['after'] ?? ''
 			];
 		}
 		if (array_key_exists('card', $subjectParams) && $event->getSubject() === ActivityManager::SUBJECT_CARD_UPDATE_TITLE) {