diff --git a/lib/Chat/MessageParser.php b/lib/Chat/MessageParser.php
index d9a822f7cc1..5b2aaa45d8f 100644
--- a/lib/Chat/MessageParser.php
+++ b/lib/Chat/MessageParser.php
@@ -112,6 +112,9 @@ protected function setActor(Message $message): void {
 					$displayName = $botName . ' (Bot)';
 				}
 			}
+		} elseif ($comment->getActorType() === Attendee::ACTOR_FEDERATED_USERS) {
+			// FIXME Read from some addressbooks?
+			$displayName = $actorId;
 		}
 
 		$message->setActor(
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 25f6548ecd4..01a9d2849bf 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -118,7 +118,10 @@ public function __construct(
 	}
 
 	protected function getActorInfo(string $actorDisplayName = ''): array {
-		if ($this->userId === null) {
+		if ($this->getRemoteAccessCloudId()) {
+			$actorType = Attendee::ACTOR_FEDERATED_USERS;
+			$actorId = $this->getRemoteAccessCloudId();
+		} elseif ($this->userId === null) {
 			$actorType = Attendee::ACTOR_GUESTS;
 			$actorId = $this->participant->getAttendee()->getActorId();