diff --git a/src/components/card/AssignmentSelector.vue b/src/components/card/AssignmentSelector.vue
index 6ff2b8ba8..9c53eddfe 100644
--- a/src/components/card/AssignmentSelector.vue
+++ b/src/components/card/AssignmentSelector.vue
@@ -19,19 +19,9 @@
 			label="displayname"
 			track-by="multiselectKey"
 			@option:selected="onSelect"
-			@option:deselected="onRemove">
-			<template #tag="scope">
-				<div class="avatarlist--inline">
-					<NcAvatar :user="scope.option.uid"
-						:display-name="scope.option.displayname"
-						:size="24"
-						:is-no-user="scope.option.isNoUser"
-						:disable-menu="true" />
-				</div>
-			</template>
-		</NcSelect>
+			@option:deselected="onRemove" />
 		<div v-else class="avatar-list--readonly">
-			<NcAvatar v-for="option in assignedUsers"
+			<NcUserBubble v-for="option in assignedUsers"
 				:key="option.primaryKey"
 				:user="option.uid"
 				:display-name="option.displayname"
@@ -43,7 +33,7 @@
 
 <script>
 import { defineComponent } from 'vue'
-import { NcAvatar, NcSelect } from '@nextcloud/vue'
+import { NcSelect, NcUserBubble } from '@nextcloud/vue'
 import AccountMultiple from 'vue-material-design-icons/AccountMultipleOutline.vue'
 
 export default defineComponent({
@@ -51,7 +41,7 @@ export default defineComponent({
 	components: {
 		AccountMultiple,
 		NcSelect,
-		NcAvatar,
+		NcUserBubble,
 	},
 	props: {
 		card: {
@@ -116,6 +106,7 @@ export default defineComponent({
 					...item.participant,
 					isNoUser: item.participant.type !== 0,
 					multiselectKey: item.participant.type + ':' + item.participant.primaryKey,
+					user: item.participant.uid,
 				}))
 			} else {
 				this.assignedUsers = []
diff --git a/src/components/card/DueDateSelector.vue b/src/components/card/DueDateSelector.vue
index 8c5b2171d..1f720303d 100644
--- a/src/components/card/DueDateSelector.vue
+++ b/src/components/card/DueDateSelector.vue
@@ -47,7 +47,7 @@
 				</NcActionButton>
 			</NcActions>
 
-			<NcButton v-if="!card.done"
+			<NcButton v-if="!card.done && canEdit"
 				type="secondary"
 				class="completed-button"
 				@click="changeCardDoneStatus()">
@@ -67,7 +67,7 @@
 					{{ formatReadableDate(duedate) }}
 				</span>
 			</div>
-			<div class="due-actions">
+			<div v-if="canEdit" class="due-actions">
 				<NcButton v-if="!card.archived"
 					type="tertiary"
 					:name="t('deck', 'Not done')"