diff --git a/lib/Service/FederatedUserService.php b/lib/Service/FederatedUserService.php
index e91b00b2b..dd650ca41 100644
--- a/lib/Service/FederatedUserService.php
+++ b/lib/Service/FederatedUserService.php
@@ -998,7 +998,9 @@ private function fillSingleCircleId(FederatedUser $federatedUser, bool $generate
 
 		$circle = $this->getSingleCircle($federatedUser, $generate);
 		$federatedUser->setSingleId($circle->getSingleId());
-		$federatedUser->setDisplayName($circle->getDisplayName());
+		if ($federatedUser->getUserType() !== Member::TYPE_USER || $federatedUser->getDisplayName() === '') {
+			$federatedUser->setDisplayName($circle->getDisplayName());
+		}
 		$federatedUser->setBasedOn($circle);
 	}