4 files changed, 3 insertions, 14 deletions
diff --git a/src/js/components/Base/UserDiv.vue b/src/js/components/Base/UserDiv.vue
index ff1d529e..35438d0b 100644
--- a/src/js/components/Base/UserDiv.vue
+++ b/src/js/components/Base/UserDiv.vue
@@ -23,7 +23,7 @@
 <template>
 	<div class="user-row" :class="type">
 		<Avatar :disable-menu="disableMenu" :menu-position="menuPosition" :user="userId"
-			:is-guest="!Boolean(OC.currentUser)"
+			:is-guest="!Boolean(getCurrentUser)"
 			:display-name="displayName"
 
 			:is-no-user="isNoUser" />
diff --git a/src/js/components/Comments/CommentAdd.vue b/src/js/components/Comments/CommentAdd.vue
index e1125db5..99dbc610 100644
--- a/src/js/components/Comments/CommentAdd.vue
+++ b/src/js/components/Comments/CommentAdd.vue
@@ -51,9 +51,6 @@ export default {
 			acl: state => state.acl,
 		}),
 
-		currentUser() {
-			return this.$store.state.acl.userId
-		},
 	},
 
 	methods: {
diff --git a/src/js/components/VoteTable/VoteList.vue b/src/js/components/VoteTable/VoteList.vue
index bc925415..37d19b19 100644
--- a/src/js/components/VoteTable/VoteList.vue
+++ b/src/js/components/VoteTable/VoteList.vue
@@ -73,10 +73,6 @@ export default {
 			'expired',
 		]),
 
-		currentUser() {
-			return this.acl.userId
-		},
-
 		noOptions() {
 			return (this.sortedOptions.length === 0)
 		},
diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue
index 7df576a7..71e0b9de 100644
--- a/src/js/components/VoteTable/VoteTable.vue
+++ b/src/js/components/VoteTable/VoteTable.vue
@@ -31,11 +31,11 @@
 				:poll-type="poll.type" />
 		</div>
 
-		<div v-for="(participant) in participants" :key="participant.userId" :class="{currentuser: (participant.userId === currentUser) }">
+		<div v-for="(participant) in participants" :key="participant.userId" :class="{currentuser: (participant.userId === acl.userId) }">
 			<UserDiv :key="participant.userId"
 				class="vote-table__user-column"
 				:disable-menu="true"
-				:class="{currentuser: (participant.userId === currentUser) }"
+				:class="{currentuser: (participant.userId === acl.userId) }"
 				:user-id="participant.userId"
 				:display-name="participant.displayName">
 				<Actions v-if="acl.allowEdit" class="action">
@@ -100,10 +100,6 @@ export default {
 			'sortedOptions',
 			'participants',
 		]),
-
-		currentUser() {
-			return this.acl.userId
-		},
 	},
 
 	methods: {