diff --git a/lib/Command/Db/Rebuild.php b/lib/Command/Db/Rebuild.php
index f6dae27155..d8448a1461 100644
--- a/lib/Command/Db/Rebuild.php
+++ b/lib/Command/Db/Rebuild.php
@@ -56,6 +56,7 @@ protected function runCommands(): int {
 
 		$this->printComment('Step 2. Tidy records before rebuilding the schema');
 		$this->fixNullish();
+		$this->migrateShareLabels();
 
 		$this->printComment('Step 3. Create or update tables to current shema');
 		$this->createOrUpdateSchema();
@@ -101,6 +102,12 @@ private function fixNullish(): void {
 		$this->printInfo($messages, '   ');
 	}
 
+	private function migrateShareLabels(): void {
+		$this->printComment(' - migrate share labels to displayname for public shares');
+		$messages = $this->tableManager->migrateShareLabels();
+		$this->printInfo($messages, '   ');
+	}
+
 	/**
 	 * Create index for $table
 	 */
diff --git a/lib/Db/Share.php b/lib/Db/Share.php
index c586371318..88ed289485 100644
--- a/lib/Db/Share.php
+++ b/lib/Db/Share.php
@@ -42,8 +42,6 @@
  * @method ?int getAnonymizedVotes()
  * @method int getDeleted()
  * @method void setDeleted(int $value)
- * @method ?string getLabel()
- * @method void setLabel(?string $value)
  */
 class Share extends EntityWithUser implements JsonSerializable {
 	/** @var string */
@@ -204,25 +202,32 @@ public function setPublicPollEmail(string $value): void {
 	}
 
 	/**
-	 * Share label for public shares, falls back to username until migrated
-	 * TODO: remove fallback after migration was introduced
+	 * Share label for public shares, now stored as displayName
+	 * TODO: remove after migration was introduced
+	 */
+	public function setLabel(string $label): void {
+		$this->setDisplayName($label);
+		$this->label = $label;
+	}
+
+	/**
+	 * Share label for public shares
+	 * TODO: remove after migrating labels to displayName
 	 */
 	public function getLabel(): string {
-		if ($this->getType() === self::TYPE_PUBLIC && $this->label) {
-			return $this->label;
-		}
-		return $this->displayName ?? '';
+		// In case of public poll use label as fallback for displayName
+		return $this->displayName ?? $this->label ?? '';
 	}
 
 	/**
 	 * Sharee's displayName. In case of public poll label is used instead
-	 * TODO: remove public poll chaeck after migration to label
+	 * TODO: remove public poll check after migration labels to displayName
 	 */
 	public function getDisplayName(): string {
 		if ($this->getType() === self::TYPE_PUBLIC) {
-			return '';
+			return $this->getLabel();
 		}
-		return (string)$this->displayName;
+		return $this->displayName ?? '';
 	}
 
 	public function getTimeZoneName(): string {
diff --git a/lib/Db/V4/TableManager.php b/lib/Db/V4/TableManager.php
index a63c163927..4003694410 100644
--- a/lib/Db/V4/TableManager.php
+++ b/lib/Db/V4/TableManager.php
@@ -213,15 +213,17 @@ public function removeObsoleteColumns(): array {
 
 		foreach (TableSchema::GONE_COLUMNS as $tableName => $columns) {
 			$tableName = $this->dbPrefix . $tableName;
-			if ($this->schema->hasTable($tableName)) {
-				$table = $this->schema->getTable($tableName);
-
-				foreach ($columns as $columnName) {
-					if ($table->hasColumn($columnName)) {
-						$dropped = true;
-						$table->dropColumn($columnName);
-						$messages[] = 'Dropped ' . $columnName . ' from ' . $tableName;
-					}
+			if (!$this->schema->hasTable($tableName)) {
+				continue;
+			}
+
+			$table = $this->schema->getTable($tableName);
+
+			foreach ($columns as $columnName) {
+				if ($table->hasColumn($columnName)) {
+					$dropped = true;
+					$table->dropColumn($columnName);
+					$messages[] = 'Dropped ' . $columnName . ' from ' . $tableName;
 				}
 			}
 		}
@@ -375,33 +377,34 @@ private function deleteDuplicates(string $table, array $columns):int {
 		$this->needsSchema();
 		$qb = $this->connection->getQueryBuilder();
 
-		if ($this->schema->hasTable($this->dbPrefix . $table)) {
-			// identify duplicates
-			$selection = $qb->selectDistinct('t1.id')
-				->from($table, 't1')
-				->innerJoin('t1', $table, 't2', $qb->expr()->lt('t1.id', 't2.id'));
+		if (!$this->schema->hasTable($this->dbPrefix . $table)) {
+			return 0;
+		}
 
-			$i = 0;
+		// identify duplicates
+		$selection = $qb->selectDistinct('t1.id')
+			->from($table, 't1')
+			->innerJoin('t1', $table, 't2', $qb->expr()->lt('t1.id', 't2.id'));
 
-			foreach ($columns as $column) {
-				if ($i > 0) {
-					$selection->andWhere($qb->expr()->eq('t1.' . $column, 't2.' . $column));
-				} else {
-					$selection->where($qb->expr()->eq('t1.' . $column, 't2.' . $column));
-				}
-				$i++;
+		$i = 0;
+
+		foreach ($columns as $column) {
+			if ($i > 0) {
+				$selection->andWhere($qb->expr()->eq('t1.' . $column, 't2.' . $column));
+			} else {
+				$selection->where($qb->expr()->eq('t1.' . $column, 't2.' . $column));
 			}
+			$i++;
+		}
 
-			$duplicates = $qb->executeQuery()->fetchAll(PDO::FETCH_COLUMN);
+		$duplicates = $qb->executeQuery()->fetchAll(PDO::FETCH_COLUMN);
 
-			$this->connection->getQueryBuilder()
-				->delete($table)
-				->where('id in (:ids)')
-				->setParameter('ids', $duplicates, IQueryBuilder::PARAM_INT_ARRAY)
-				->executeStatement();
-			return count($duplicates);
-		}
-		return 0;
+		$this->connection->getQueryBuilder()
+			->delete($table)
+			->where('id in (:ids)')
+			->setParameter('ids', $duplicates, IQueryBuilder::PARAM_INT_ARRAY)
+			->executeStatement();
+		return count($duplicates);
 	}
 
 	/**
@@ -423,19 +426,24 @@ public function removeObsoleteMigrations(): array {
 	}
 
 	public function fixVotes(): void {
-		if ($this->schema->hasTable($this->dbPrefix . OptionMapper::TABLE)) {
-			$table = $this->schema->getTable($this->dbPrefix . OptionMapper::TABLE);
-			if ($table->hasColumn('duration')) {
-				$foundOptions = $this->optionMapper->findOptionsWithDuration();
-				foreach ($foundOptions as $option) {
-					$this->voteMapper->fixVoteOptionText(
-						$option->getPollId(),
-						$option->getId(),
-						$option->getPollOptionTextStart(),
-						$option->getPollOptionText(),
-					);
-				}
-			}
+		if (!$this->schema->hasTable($this->dbPrefix . OptionMapper::TABLE)) {
+			return;
+		}
+
+		$table = $this->schema->getTable($this->dbPrefix . OptionMapper::TABLE);
+
+		if (!$table->hasColumn('duration')) {
+			return;
+		}
+
+		$foundOptions = $this->optionMapper->findOptionsWithDuration();
+		foreach ($foundOptions as $option) {
+			$this->voteMapper->fixVoteOptionText(
+				$option->getPollId(),
+				$option->getId(),
+				$option->getPollOptionTextStart(),
+				$option->getPollOptionText(),
+			);
 		}
 	}
 
@@ -548,58 +556,64 @@ public function setLastInteraction(?int $timestamp = null): string {
 	 */
 	private function updateVoteHashes(Schema &$schema): array {
 		$messages = [];
-		if ($schema->hasTable($this->dbPrefix . VoteMapper::TABLE)) {
-			$table = $schema->getTable($this->dbPrefix . VoteMapper::TABLE);
-			$count = 0;
-			$updated = 0;
-			if ($table->hasColumn('vote_option_hash')) {
-				foreach ($this->voteMapper->getAll(includeNull: true) as $vote) {
-					try {
-						// if the hash of the vote differs from calculated hash update the vote hash
-						if ($vote->getVoteOptionHash() !== Hash::getOptionHash($vote->getPollId(), $vote->getVoteOptionText())) {
-							$vote->setVoteOptionHash(Hash::getOptionHash($vote->getPollId(), $vote->getVoteOptionText()));
-							$vote = $this->voteMapper->update($vote);
-							$updated++;
-						}
-
-						$count++;
-
-					} catch (Exception $e) {
-						$messages[] = 'Skip hash update - Error updating option hash for voteId ' . $vote->getId();
-						$this->logger->error('Error updating option hash for voteId {id}', [
-							'id' => $vote->getId(),
-							'message' => $e->getMessage()
-						]);
-					}
-				}
+		if (!$schema->hasTable($this->dbPrefix . VoteMapper::TABLE)) {
+			$this->logger->error('{db} is missing- aborted recalculating hashes', [
+				'db' => $this->dbPrefix . VoteMapper::TABLE
+			]);
+			$messages[] = 'Table ' . $this->dbPrefix . VoteMapper::TABLE . ' does not exist';
+			return $messages;
+		}
 
-				if ($updated === 0) {
-					$this->logger->info('Verified {count} vote hashes in {db}', [
-						'count' => $count,
-						'db' => $this->dbPrefix . VoteMapper::TABLE
-					]);
-					$messages[] = 'No vote hashes to update';
+		$table = $schema->getTable($this->dbPrefix . VoteMapper::TABLE);
 
-				} else {
-					$this->logger->info('Updated {updated} hashes of {count} votes in {db}', [
-						'updated' => $updated,
-						'count' => $count,
-						'db' => $this->dbPrefix . VoteMapper::TABLE
-					]);
-					$messages[] = 'Updated ' . $updated . ' vote hashes';
+		if (!$table->hasColumn('vote_option_hash')) {
+			$this->logger->error('{db} is missing column \'poll_option_hash\' - aborted recalculating hashes', [
+				'db' => $this->dbPrefix . VoteMapper::TABLE
+			]);
+			$messages[] = 'Column \'vote_option_hash\' does not exist in ' . $this->dbPrefix . VoteMapper::TABLE;
+			return $messages;
+		}
+
+		$count = 0;
+		$updated = 0;
 
+		foreach ($this->voteMapper->getAll(includeNull: true) as $vote) {
+			try {
+				// if the hash of the vote differs from calculated hash update the vote hash
+				if ($vote->getVoteOptionHash() !== Hash::getOptionHash($vote->getPollId(), $vote->getVoteOptionText())) {
+					$vote->setVoteOptionHash(Hash::getOptionHash($vote->getPollId(), $vote->getVoteOptionText()));
+					$vote = $this->voteMapper->update($vote);
+					$updated++;
 				}
 
-			} else {
-				$this->logger->error('{db} is missing column \'poll_option_hash\' - aborted recalculating hashes', [
-					'db' => $this->dbPrefix . VoteMapper::TABLE
+				$count++;
+
+			} catch (Exception $e) {
+				$messages[] = 'Skip hash update - Error updating option hash for voteId ' . $vote->getId();
+				$this->logger->error('Error updating option hash for voteId {id}', [
+					'id' => $vote->getId(),
+					'message' => $e->getMessage()
 				]);
 			}
+		}
+
+		if ($updated === 0) {
+			$this->logger->info('Verified {count} vote hashes in {db}', [
+				'count' => $count,
+				'db' => $this->dbPrefix . VoteMapper::TABLE
+			]);
+			$messages[] = 'No vote hashes to update';
+
 		} else {
-			$this->logger->error('{db} is missing- aborted recalculating hashes', [
+			$this->logger->info('Updated {updated} hashes of {count} votes in {db}', [
+				'updated' => $updated,
+				'count' => $count,
 				'db' => $this->dbPrefix . VoteMapper::TABLE
 			]);
+			$messages[] = 'Updated ' . $updated . ' vote hashes';
+
 		}
+
 		return $messages;
 	}
 
@@ -611,53 +625,56 @@ private function updateVoteHashes(Schema &$schema): array {
 	private function updateOptionHashes(Schema &$schema): array {
 		$messages = [];
 
-		if ($schema->hasTable($this->dbPrefix . OptionMapper::TABLE)) {
-			$table = $schema->getTable($this->dbPrefix . OptionMapper::TABLE);
-			$count = 0;
-			$updated = 0;
-
-			if ($table->hasColumn('poll_option_hash')) {
-				foreach ($this->optionMapper->getAll(includeNull: true) as $option) {
-					try {
-						// if the option's hash differs from $actualHash update the option
-						if ($option->getPollOptionHash() !== Hash::getOptionHash($option->getPollId(), $option->getPollOptionText())) {
-							$option->setPollOptionHash(Hash::getOptionHash($option->getPollId(), $option->getPollOptionText()));
-							$option = $this->optionMapper->update($option);
-							$updated++;
-						}
-
-						$count++;
-
-					} catch (Exception $e) {
-						$messages[] = 'Skip hash update - Error updating option hash for optionId ' . $option->getId();
-						$this->logger->error('Error updating option hash for optionId {id}', ['id' => $option->getId(), 'message' => $e->getMessage()]);
-					}
-				}
+		if (!$schema->hasTable($this->dbPrefix . OptionMapper::TABLE)) {
+			$this->logger->error('{db} is missing - aborted recalculating hashes', [ 'db' => $this->dbPrefix . OptionMapper::TABLE]);
+			$messages[] = 'Table ' . $this->dbPrefix . OptionMapper::TABLE . ' does not exist';
+			return $messages;
+		}
+		$table = $schema->getTable($this->dbPrefix . OptionMapper::TABLE);
 
-				if ($updated === 0) {
-					$this->logger->info('Verified {count} option hashes in {db}', [
-						'count' => $count,
-						'db' => $this->dbPrefix . OptionMapper::TABLE
-					]);
-					$messages[] = 'No option hashes to update';
+		if (!$table->hasColumn('poll_option_hash')) {
+			$this->logger->error('{db} is missing column \'poll_option_hash\' - aborted recalculating hashes', [ 'db' => $this->dbPrefix . OptionMapper::TABLE]);
+			$messages[] = 'Column \'poll_option_hash\' does not exist in ' . $this->dbPrefix . OptionMapper::TABLE;
+			return $messages;
+		}
 
-				} else {
-					$this->logger->info('Updated {updated} hashes of {count} options in {db}', [
-						'updated' => $updated,
-						'count' => $count,
-						'db' => $this->dbPrefix . OptionMapper::TABLE
-					]);
-					$messages[] = 'Updated ' . $updated . ' option hashes';
+		$count = 0;
+		$updated = 0;
 
+		foreach ($this->optionMapper->getAll(includeNull: true) as $option) {
+			try {
+				// if the option's hash differs from $actualHash update the option
+				if ($option->getPollOptionHash() !== Hash::getOptionHash($option->getPollId(), $option->getPollOptionText())) {
+					$option->setPollOptionHash(Hash::getOptionHash($option->getPollId(), $option->getPollOptionText()));
+					$option = $this->optionMapper->update($option);
+					$updated++;
 				}
 
-			} else {
-				$this->logger->error('{db} is missing column \'poll_option_hash\' - aborted recalculating hashes', [ 'db' => $this->dbPrefix . OptionMapper::TABLE]);
+				$count++;
+
+			} catch (Exception $e) {
+				$messages[] = 'Skip hash update - Error updating option hash for optionId ' . $option->getId();
+				$this->logger->error('Error updating option hash for optionId {id}', ['id' => $option->getId(), 'message' => $e->getMessage()]);
 			}
+		}
+
+		if ($updated === 0) {
+			$this->logger->info('Verified {count} option hashes in {db}', [
+				'count' => $count,
+				'db' => $this->dbPrefix . OptionMapper::TABLE
+			]);
+			$messages[] = 'No option hashes to update';
 
 		} else {
-			$this->logger->error('{db} is missing - aborted recalculating hashes', [ 'db' => $this->dbPrefix . OptionMapper::TABLE]);
+			$this->logger->info('Updated {updated} hashes of {count} options in {db}', [
+				'updated' => $updated,
+				'count' => $count,
+				'db' => $this->dbPrefix . OptionMapper::TABLE
+			]);
+			$messages[] = 'Updated ' . $updated . ' option hashes';
+
 		}
+
 		return $messages;
 	}
 
@@ -667,4 +684,52 @@ public function updateHashes(): array {
 		$messages = array_merge($messages, $this->updateVoteHashes($schema));
 		return $messages;
 	}
+
+	/**
+	 * @return string[]
+	 *
+	 * @psalm-return list{0?: string,...}
+	 */
+	public function migrateShareLabels(): array {
+		$schema = $this->connection->createSchema();
+		$messages = [];
+
+		if (!$schema->hasTable($this->dbPrefix . Share::TABLE)) {
+			$this->logger->error('{db} is missing - aborted migrating labels', [ 'db' => $this->dbPrefix . Share::TABLE]);
+			$messages[] = 'Table ' . $this->dbPrefix . Share::TABLE . ' does not exist';
+			return $messages;
+		}
+		$table = $schema->getTable($this->dbPrefix . Share::TABLE);
+
+		if (!$table->hasColumn('label')) {
+			$this->logger->error('{db} is missing column \'label\' - aborted migrating labels', [ 'db' => $this->dbPrefix . Share::TABLE]);
+			$messages[] = 'Column \'label\' does not exist in ' . $this->dbPrefix . Share::TABLE;
+			return $messages;
+		}
+
+		$qb = $this->connection->getQueryBuilder();
+
+		$qb->update(Share::TABLE)
+			->set('display_name', 'label') // safe: assigns column B's value into A
+			->andWhere($qb->expr()->isNotNull(Share::TABLE . '.label'))
+			->andWhere($qb->expr()->eq(Share::TABLE . '.label', $qb->expr()->literal('')));
+		$updated = $qb->executeStatement();
+
+		if ($updated === 0) {
+			$this->logger->info('Verified all share labels in {db}', [
+				'db' => $this->dbPrefix . Share::TABLE
+			]);
+			$messages[] = 'No share labels to update';
+
+		} else {
+			$this->logger->info('Updated {updated} labels in {db}', [
+				'updated' => $updated,
+				'db' => $this->dbPrefix . Share::TABLE
+			]);
+			$messages[] = 'Updated ' . $updated . ' option hashes';
+
+		}
+
+		return $messages;
+	}
 }
diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 3cc72e7f16..7cfc718107 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -295,10 +295,6 @@ public function setLabel(string $label, string $token): Share {
 				->request(Poll::PERMISSION_POLL_EDIT);
 			$this->share->setLabel($label);
 
-			// overwrite any possible displayName
-			// TODO: Remove afte rmigratiuon to label
-			$this->share->setDisplayName('');
-
 			$dispatchEvent = new ShareChangedLabelEvent($this->share);
 		} else {
 			throw new InvalidShareTypeException('Label can only be set for public shares.');
diff --git a/src/components/Combo/ComboTable.vue b/src/components/Combo/ComboTable.vue
index 3d093f8eaf..5d611dd52b 100644
--- a/src/components/Combo/ComboTable.vue
+++ b/src/components/Combo/ComboTable.vue
@@ -28,7 +28,7 @@ const comboStore = useComboStore()
 					v-for="participant in comboStore.participantsInPoll(poll.id)"
 					:key="`${participant.user.id}_${participant.pollId}`"
 					class="participant">
-					<UserItem v-bind="participant" condensed />
+					<UserItem :user="participant.user" condensed />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/Options/OptionItemOwner.vue b/src/components/Options/OptionItemOwner.vue
index 5239af098f..4732f81570 100644
--- a/src/components/Options/OptionItemOwner.vue
+++ b/src/components/Options/OptionItemOwner.vue
@@ -51,7 +51,6 @@ const showDelete = computed(
 			:user="option.owner"
 			:icon-size="avatarSize"
 			hide-names
-			hide-status
 			:tooltip-message="
 				t('polls', '{displayName}\'s proposal', {
 					displayName: option.owner?.displayName ?? '',
diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index cf69f5fcd6..e328b939bb 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { t } from '@nextcloud/l10n'
 
 import VotedIcon from 'vue-material-design-icons/CheckboxMarked.vue'
@@ -14,11 +14,52 @@ import UserItem from '../User/UserItem.vue'
 import ShareMenu from './ShareMenu.vue'
 
 import type { Share } from '../../stores/shares.types'
+import { AvatarTypeIcon } from '../User/UserAvatar.types'
 
 const emit = defineEmits(['showQrCode'])
 
 const { share, tag = 'div' } = defineProps<{ share: Share; tag?: string }>()
 
+const publicShareDescription = computed(() => {
+	if (share.displayName === '') {
+		return t('polls', 'Token: {token}', { token: share.user.id })
+	}
+	return t('polls', 'Public link: {token}', { token: share.user.id })
+})
+
+const userDescription = computed(() => {
+	if (share.groupId && !share.pollId) {
+		return t('polls', 'Poll group access')
+	}
+	if (share.deleted) {
+		return t('polls', '(deleted)')
+	}
+	if (share.locked) {
+		return t('polls', '(locked)')
+	}
+	if (share.type === 'public') {
+		return publicShareDescription.value
+	}
+	if (share.type === 'group') {
+		return t('polls', 'Group share')
+	}
+	if (share.type === 'contactGroup') {
+		return t('polls', 'Resolve contact group first!')
+	}
+	if (share.type === 'circle') {
+		return t('polls', 'Resolve this team first!')
+	}
+
+	return ''
+})
+
+const computedTypeIcon = computed<AvatarTypeIcon>(() => {
+	if (share.groupId && !share.pollId) {
+		return 'pollGroupIcon'
+	}
+	return true
+})
+
 const label = ref({
 	inputValue: '',
 	inputProps: {
@@ -30,16 +71,6 @@ const label = ref({
 	},
 })
 
-const userItemProps = computed(() => ({
-	user: share.user,
-	label: share.label,
-	showEmail: true,
-	resolveInfo: true,
-	forcedDescription: share.deleted ? `(${t('polls', 'deleted')})` : null,
-	showTypeIcon: true,
-	icon: true,
-}))
-
 onMounted(() => {
 	label.value.inputValue = share.label
 })
@@ -47,24 +78,22 @@ onMounted(() => {
 
 <template>
 	<UserItem
-		v-bind="userItemProps"
-		:class="{ deleted: share.deleted }"
 		:tag="tag"
-		:delegated-from-group="!share.pollId"
-		:deleted-state="share.deleted"
-		:locked-state="share.locked">
+		:class="{ deleted: share.deleted }"
+		:user="share.user"
+		show-email
+		:type-icon="computedTypeIcon"
+		:description="userDescription"
+		:label="share.label">
 		<template #status>
-			<div v-if="share.voted">
+			<div v-if="share.groupId || ['public', 'group'].includes(share.type)">
+				<div class="vote-status empty" />
+			</div>
+			<div v-else-if="share.voted">
 				<VotedIcon
 					class="vote-status voted"
 					:name="t('polls', 'Has voted')" />
 			</div>
-			<div
-				v-else-if="
-					share.groupId || ['public', 'group'].includes(share.type)
-				">
-				<div class="vote-status empty" />
-			</div>
 			<div v-else>
 				<UnvotedIcon
 					class="vote-status unvoted"
diff --git a/src/components/Shares/ShareItemAllUsers.vue b/src/components/Shares/ShareItemAllUsers.vue
index 9604edf20b..d03a71a4b1 100644
--- a/src/components/Shares/ShareItemAllUsers.vue
+++ b/src/components/Shares/ShareItemAllUsers.vue
@@ -19,12 +19,12 @@ const pollStore = usePollStore()
 
 const userItemProps = computed<{
 	label: string
-	type: VirtualUserItemType
+	virtualUserType: VirtualUserItemType
 	disabled?: boolean
 	description?: string
 }>(() => ({
 	label: t('polls', 'Internal access'),
-	type: 'internalAccess',
+	virtualUserType: 'internalAccess',
 	disabled: pollStore.configuration.access === 'private',
 	description:
 		pollStore.configuration.access === 'private'
diff --git a/src/components/Shares/SharePublicAdd.vue b/src/components/Shares/SharePublicAdd.vue
index 73eeff1116..0a59ae15c3 100644
--- a/src/components/Shares/SharePublicAdd.vue
+++ b/src/components/Shares/SharePublicAdd.vue
@@ -22,10 +22,10 @@ const sharesStore = useSharesStore()
 
 const userItemProps: {
 	label: string
-	type: VirtualUserItemType
+	virtualUserType: VirtualUserItemType
 } = {
 	label: t('polls', 'Add a new public link'),
-	type: 'addPublicLink',
+	virtualUserType: 'addPublicLink',
 }
 
 /**
diff --git a/src/components/User/UserAvatar.types.ts b/src/components/User/UserAvatar.types.ts
new file mode 100644
index 0000000000..1daec53f45
--- /dev/null
+++ b/src/components/User/UserAvatar.types.ts
@@ -0,0 +1,6 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+export type AvatarTypeIcon = boolean | 'pollGroupIcon'
diff --git a/src/components/User/UserAvatar.vue b/src/components/User/UserAvatar.vue
new file mode 100644
index 0000000000..3dd2045711
--- /dev/null
+++ b/src/components/User/UserAvatar.vue
@@ -0,0 +1,122 @@
+<!--
+  - SPDX-FileCopyrightText: 2018 Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import NcAvatar from '@nextcloud/vue/components/NcAvatar'
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { createDefault } from '../../Types'
+import type { User, VirtualUserItemType } from '../../Types'
+import type { AvatarTypeIcon } from './UserAvatar.types.ts'
+import AdminIcon from 'vue-material-design-icons/ShieldCrownOutline.vue'
+import LinkIcon from 'vue-material-design-icons/Link.vue'
+import ContactIcon from 'vue-material-design-icons/CardAccountDetailsOutline.vue'
+import EmailIcon from 'vue-material-design-icons/EmailOutline.vue'
+import ShareIcon from 'vue-material-design-icons/ShareVariantOutline.vue'
+import ContactGroupIcon from 'vue-material-design-icons/AccountGroupOutline.vue'
+import GroupIcon from 'vue-material-design-icons/AccountMultipleOutline.vue'
+import CircleIcon from 'vue-material-design-icons/GoogleCirclesExtended.vue'
+import DeletedUserIcon from 'vue-material-design-icons/AccountOffOutline.vue'
+import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'
+import PollGroupIcon from 'vue-material-design-icons/CodeBraces.vue'
+import OpenPollIcon from 'vue-material-design-icons/Earth.vue'
+const route = useRoute()
+
+interface Props {
+	mdIconSize?: number
+	virtualUserType?: VirtualUserItemType
+	typeIcon?: AvatarTypeIcon
+	typeIconSize?: number
+	user: User
+}
+const {
+	mdIconSize = 20,
+	virtualUserType,
+	typeIcon = false,
+	typeIconSize = 16,
+	user = createDefault<User>(),
+} = defineProps<Props>()
+
+const computedIsGuest = computed(
+	() => route.name === 'publicVote' || user.isNoUser !== false,
+)
+
+const avatarUserId = computed(() => {
+	if (virtualUserType || user.isNoUser) {
+		return user.displayName
+	}
+	return user.id
+})
+
+const useIconSlot = computed(
+	() =>
+		(virtualUserType
+			&& ['internalAccess', 'addPublicLink'].includes(virtualUserType))
+		|| (user.type
+			&& [
+				'public',
+				'contactGroup',
+				'group',
+				'circle',
+				'deleted',
+				'anonymous',
+			].includes(user.type)),
+)
+</script>
+
+<template>
+	<NcAvatar
+		v-bind="$attrs"
+		:is-guest="computedIsGuest"
+		:is-no-user="user.isNoUser"
+		:display-name="user.displayName"
+		:user="avatarUserId"
+		class="user-item__avatar">
+		<template v-if="useIconSlot" #icon>
+			<LinkIcon v-if="user.type === 'public'" :size="mdIconSize" />
+			<LinkIcon
+				v-if="virtualUserType === 'addPublicLink'"
+				:size="mdIconSize" />
+			<AnoymousIcon v-if="user.type === 'anonymous'" :size="mdIconSize" />
+			<OpenPollIcon
+				v-if="virtualUserType === 'internalAccess'"
+				:size="mdIconSize" />
+			<ContactGroupIcon
+				v-if="user.type === 'contactGroup'"
+				:size="mdIconSize" />
+			<GroupIcon v-if="user.type === 'group'" :size="mdIconSize" />
+			<CircleIcon v-if="user.type === 'circle'" :size="mdIconSize" />
+			<DeletedUserIcon v-if="user.type === 'deleted'" :size="mdIconSize" />
+		</template>
+	</NcAvatar>
+	<AdminIcon
+		v-if="typeIcon && user.type === 'admin'"
+		:size="typeIconSize"
+		class="type-icon" />
+	<ContactIcon
+		v-else-if="typeIcon && user.type === 'contact'"
+		:size="typeIconSize"
+		class="type-icon" />
+	<EmailIcon
+		v-else-if="typeIcon && user.type === 'email'"
+		:size="typeIconSize"
+		class="type-icon" />
+	<ShareIcon
+		v-else-if="typeIcon && user.type === 'external'"
+		:size="typeIconSize"
+		class="type-icon" />
+	<PollGroupIcon
+		v-else-if="typeIcon === 'pollGroupIcon'"
+		:size="typeIconSize"
+		class="type-icon" />
+</template>
+<style scoped lang="scss">
+.type-icon {
+	position: absolute;
+	background-size: 16px;
+	top: -6px;
+	inset-inline-start: -6px;
+}
+</style>
diff --git a/src/components/User/UserBubble.vue b/src/components/User/UserBubble.vue
index 0da66990de..520d7a4ddf 100644
--- a/src/components/User/UserBubble.vue
+++ b/src/components/User/UserBubble.vue
@@ -9,31 +9,13 @@ import { t } from '@nextcloud/l10n'
 
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 
-import type { User } from '../../Types'
+import { createDefault, type User } from '../../Types'
 
 interface Props {
 	user: User
 }
 
-const {
-	user = {
-		id: '',
-		displayName: '',
-		emailAddress: '',
-		isNoUser: true,
-		isAdmin: false,
-		isGuest: false,
-		type: '',
-		subName: null,
-		subtitle: null,
-		desc: null,
-		organisation: null,
-		languageCode: '',
-		localeCode: null,
-		timeZone: null,
-		categories: null,
-	},
-} = defineProps<Props>()
+const { user = createDefault<User>() } = defineProps<Props>()
 
 const bubbleProps = computed(() => ({
 	user: user.isNoUser || user.isGuest ? undefined : user.id,
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index 2c08888b76..4f6d3d2c0d 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -5,205 +5,86 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useRoute } from 'vue-router'
-import { getCurrentUser } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
 
-import NcAvatar from '@nextcloud/vue/components/NcAvatar'
-import AdminIcon from 'vue-material-design-icons/ShieldCrownOutline.vue'
-import LinkIcon from 'vue-material-design-icons/Link.vue'
-import ContactIcon from 'vue-material-design-icons/CardAccountDetailsOutline.vue'
-import EmailIcon from 'vue-material-design-icons/EmailOutline.vue'
-import ShareIcon from 'vue-material-design-icons/ShareVariantOutline.vue'
-import ContactGroupIcon from 'vue-material-design-icons/AccountGroupOutline.vue'
-import GroupIcon from 'vue-material-design-icons/AccountMultipleOutline.vue'
-import CircleIcon from 'vue-material-design-icons/GoogleCirclesExtended.vue'
-import DeletedUserIcon from 'vue-material-design-icons/AccountOffOutline.vue'
-import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'
-import PollGroupIcon from 'vue-material-design-icons/CodeBraces.vue'
+import { createDefault, User, UserType, VirtualUserItemType } from '../../Types'
+import UserAvatar from './UserAvatar.vue'
 
-import { User, UserType, VirtualUserItemType } from '../../Types'
-
-defineOptions({
-	inheritAttrs: true,
-})
+defineOptions({ inheritAttrs: false })
 
 interface Props {
+	condensed?: boolean
+	description?: string
 	disabled?: boolean
-	deletedState?: boolean
-	lockedState?: boolean
 	hideNames?: boolean
 	showEmail?: boolean
-	disableMenu?: boolean
-	disableTooltip?: boolean
-	resolveInfo?: boolean
-	description?: string
-	label?: string
-	type?: UserType | VirtualUserItemType
 	tag?: string
+	virtualUserType?: VirtualUserItemType
 	user?: User
-	showTypeIcon?: boolean
-	iconSize?: number
-	mdIconSize?: number
-	typeIconSize?: number
-	hideStatus?: boolean
-	condensed?: boolean
-	delegatedFromGroup?: boolean
 }
 
 const {
+	condensed = false,
+	description,
 	disabled = false,
-	deletedState = false,
-	lockedState = false,
 	hideNames = false,
 	showEmail = false,
-	disableMenu = true,
-	disableTooltip = false,
-	resolveInfo = false,
-	description,
-	label = '',
 	tag = 'div',
-	type = '',
-	user = {
-		id: '',
-		displayName: '',
-		emailAddress: '',
-		isNoUser: true,
-		isAdmin: false,
-		type: '',
-		subName: null,
-		subtitle: null,
-		desc: null,
-		organisation: null,
-		languageCode: '',
-		localeCode: null,
-		timeZone: null,
-		categories: null,
-	},
-	showTypeIcon = false,
-	iconSize = 32,
-	mdIconSize = 20,
-	typeIconSize = 16,
-	hideStatus = false,
-	condensed = false,
-	delegatedFromGroup = false,
+	virtualUserType,
+	user = createDefault<User>(),
 } = defineProps<Props>()
 
-const route = useRoute()
-
-const isGuestComputed = computed(() => route.name === 'publicVote' || user.isNoUser)
-const avatarProps = computed(() => ({
-	user: avatarUserId.value,
-	showUserStatus: showUserStatusComputed.value,
-	isGuest: isGuestComputed.value,
-	displayName: labelComputed.value,
-	size: iconSize,
-	disableTooltip,
-	disableMenu,
-	isNoUser: user.isNoUser,
-}))
-
-const useIconSlot = computed(() =>
-	[
-		'internalAccess',
-		'addPublicLink',
-		'public',
-		'contactGroup',
-		'group',
-		'circle',
-		'deleted',
-		'anonymous',
-	].includes(typeComputed.value),
+const computedRoleType = computed<UserType | VirtualUserItemType>(
+	() => user.type ?? virtualUserType,
 )
 
-const typeComputed = computed<UserType | VirtualUserItemType>(
-	() => user.type ?? type,
-)
-const descriptionComputed = computed(() => {
+const computedDescription = computed(() => {
 	if (condensed) {
 		return ''
 	}
-	if (delegatedFromGroup) {
-		return t('polls', 'Poll group access')
-	}
-	if (deletedState) {
-		return t('polls', '(deleted)')
-	}
-	if (lockedState) {
-		return t('polls', '(locked)')
-	}
 	if (description !== '') {
 		return description
 	}
-	if (typeComputed.value === 'public') {
-		return publicShareDescription
-	}
-	if (typeComputed.value === 'deleted') {
+	if (user.type === 'deleted') {
 		return t('polls', 'The participant got removed from this poll')
 	}
-	if (typeComputed.value === 'admin') {
+	if (user.type === 'admin') {
 		return t('polls', 'Administrative rights granted')
 	}
-	if (typeComputed.value === 'anonymous') {
+	if (user.type === 'anonymous') {
 		return t('polls', 'Anonymized participant')
 	}
 	return emailAddressComputed
 })
-const labelComputed = computed(() => {
-	if (label !== '') {
-		return label
+
+const computedLabel = computed(() => {
+	if (virtualUserType === 'internalAccess') {
+		return t('polls', 'Internal access')
 	}
-	if (typeComputed.value === 'public') {
-		return publicShareLabel.value
+	if (virtualUserType === 'addPublicLink') {
+		return t('polls', 'Add public link')
 	}
-	if (typeComputed.value === 'deleted') {
+	if (user.type === 'public') {
+		return user.displayName || t('polls', 'Public link')
+	}
+	if (user.type === 'deleted') {
 		return t('polls', 'Deleted participant')
 	}
 	return user.displayName ?? user.id
 })
 
-const avatarUserId = computed(() => {
-	if (isGuestComputed.value) {
-		return user.displayName
-	}
-	return user.id
-})
-
-const publicShareDescription = computed(() => {
-	if (label === '') {
-		return t('polls', 'Token: {token}', { token: user.id })
-	}
-	return t('polls', 'Public link: {token}', { token: user.id })
-})
-
-const publicShareLabel = computed(() => {
-	if (label === '') {
-		return t('polls', 'Public link')
-	}
-	return label
-})
-
 const emailAddressComputed = computed(() => {
-	if (
-		resolveInfo
-		&& (typeComputed.value === 'contactGroup' || typeComputed.value === 'circle')
-	) {
-		return t('polls', 'Resolve this group first!')
-	}
-
 	if (
 		showEmail
 		&& user.emailAddress !== user.displayName
-		&& (typeComputed.value === 'external' || typeComputed.value === 'email')
+		&& (computedRoleType.value === 'external'
+			|| computedRoleType.value === 'email')
 	) {
 		return user.emailAddress
 	}
 
 	return ''
 })
-const showUserStatusComputed = computed(
-	() => hideStatus && Boolean(getCurrentUser()),
-)
 
 /**
  *
@@ -212,9 +93,10 @@ function showMenu() {
 	// TODO: implement
 	return true
 }
+
 const componentClass = computed(() => [
 	'user-item',
-	typeComputed.value,
+	virtualUserType || user.type,
 	{
 		disabled,
 		condensed,
@@ -225,68 +107,25 @@ const componentClass = computed(() => [
 <template>
 	<component :is="tag" :class="componentClass">
 		<div class="avatar-wrapper">
-			<NcAvatar
-				v-bind="avatarProps"
-				class="user-item__avatar"
-				@click="showMenu()">
-				<template v-if="useIconSlot" #icon>
-					<LinkIcon v-if="typeComputed === 'public'" :size="mdIconSize" />
-					<LinkIcon
-						v-if="typeComputed === 'addPublicLink'"
-						:size="mdIconSize" />
-					<AnoymousIcon
-						v-if="typeComputed === 'anonymous'"
-						:size="mdIconSize" />
-					<LinkIcon
-						v-if="typeComputed === 'internalAccess'"
-						:size="mdIconSize" />
-					<ContactGroupIcon
-						v-if="typeComputed === 'contactGroup'"
-						:size="mdIconSize" />
-					<GroupIcon v-if="typeComputed === 'group'" :size="mdIconSize" />
-					<CircleIcon
-						v-if="typeComputed === 'circle'"
-						:size="mdIconSize" />
-					<DeletedUserIcon
-						v-if="typeComputed === 'deleted'"
-						:size="mdIconSize" />
-				</template>
-			</NcAvatar>
-
+			<UserAvatar
+				v-bind="$attrs"
+				:virtual-user-type="virtualUserType"
+				:user="user"
+				:label="computedLabel"
+				@click="showMenu()" />
 			<div v-if="$slots.menu" class="hover-menu">
 				<slot name="menu" />
 			</div>
-
-			<AdminIcon
-				v-if="showTypeIcon && typeComputed === 'admin'"
-				:size="typeIconSize"
-				class="type-icon" />
-			<ContactIcon
-				v-else-if="showTypeIcon && typeComputed === 'contact'"
-				:size="typeIconSize"
-				class="type-icon" />
-			<EmailIcon
-				v-else-if="showTypeIcon && typeComputed === 'email'"
-				:size="typeIconSize"
-				class="type-icon" />
-			<ShareIcon
-				v-else-if="showTypeIcon && typeComputed === 'external'"
-				:size="typeIconSize"
-				class="type-icon" />
-			<PollGroupIcon
-				v-else-if="showTypeIcon && delegatedFromGroup"
-				:size="typeIconSize"
-				class="type-icon" />
 		</div>
 
 		<slot name="status" />
 
 		<div v-if="!hideNames" class="user-item__name">
-			<div class="name" :title="labelComputed">
-				{{ labelComputed }}
+			<div class="name" :title="computedLabel">
+				{{ computedLabel }}
 			</div>
 			<div class="description">
-				{{ descriptionComputed }}
+				{{ computedDescription }}
 			</div>
 		</div>