diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 3ea1c4bc9..c6038b13c 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -2,7 +2,10 @@
   <div class="contribution-messages-list">
     <b-container>
       <div v-for="message in messages" v-bind:key="message.id">
-        <contribution-messages-list-item :message="message" />
+        <contribution-messages-list-item
+          :message="message"
+          :contributionUserId="contributionUserId"
+        />
       </div>
     </b-container>
 
@@ -35,6 +38,10 @@ export default {
       type: String,
       required: true,
     },
+    contributionUserId: {
+      type: Number,
+      required: true,
+    },
   },
   data() {
     return {
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index d02b5053a..3f9fef77d 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -13,6 +13,14 @@ describe('ContributionMessagesListItem', () => {
     $t: jest.fn((t) => t),
     $d: dateMock,
     $n: numberMock,
+    $store: {
+      state: {
+        moderator: {
+          firstName: 'Peter',
+          lastName: 'Lustig',
+        },
+      },
+    },
   }
 
   describe('if message author has moderator role', () => {
@@ -51,27 +59,21 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has the complete user name', () => {
-        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(2)').text()).toBe(
-          'Peter Lustig',
-        )
+        expect(wrapper.find('[data-test="moderator-name"]').text()).toBe('Peter Lustig')
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.text-right.is-moderator > span:nth-child(3)').text()).toMatch(
+        expect(wrapper.find('[data-test="moderator-date"]').text()).toMatch(
           'Mon Aug 29 2022 12:23:27 GMT+0000',
         )
       })
 
       it('has the moderator label', () => {
-        expect(wrapper.find('div.text-right.is-moderator > small:nth-child(4)').text()).toBe(
-          'moderator',
-        )
+        expect(wrapper.find('[data-test="moderator-label"]').text()).toBe('moderator.moderator')
       })
 
       it('has the message', () => {
-        expect(wrapper.find('div.text-right.is-moderator > div:nth-child(5)').text()).toBe(
-          'Lorem ipsum?',
-        )
+        expect(wrapper.find('[data-test="moderator-message"]').text()).toBe('Lorem ipsum?')
       })
     })
   })
@@ -107,23 +109,21 @@ describe('ContributionMessagesListItem', () => {
       })
 
       it('has a DIV .text-left.is-not-moderator', () => {
-        expect(wrapper.find('div.text-left.is-not-moderator').exists()).toBe(true)
+        expect(wrapper.find('div.text-left.is-user').exists()).toBe(true)
       })
 
       it('has the complete user name', () => {
-        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(2)').text()).toBe(
-          'Bibi Bloxberg',
-        )
+        expect(wrapper.find('[data-test="user-name"]').text()).toBe('Bibi Bloxberg')
       })
 
       it('has the message creation date', () => {
-        expect(wrapper.find('div.is-not-moderator.text-left > span:nth-child(3)').text()).toMatch(
+        expect(wrapper.find('[data-test="user-date"]').text()).toMatch(
           'Mon Aug 29 2022 12:25:34 GMT+0000',
         )
       })
 
       it('has the message', () => {
-        expect(wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)').text()).toBe(
+        expect(wrapper.find('[data-test="user-message"]').text()).toBe(
           'Asda sdad ad asdasd, das Ass das Das.',
         )
       })
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 4a212ef23..5be952a2c 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -5,14 +5,18 @@
       class="text-right is-moderator p-2 rounded-sm mb-3"
       :class="isModeratorMessage ? 'is-hidden-moderator-message ' : 'is-moderator-message'"
     >
-      <small class="ml-4">
+      <small class="ml-4" data-test="moderator-label">
         {{ $t('moderator.moderator') }}
       </small>
-      <small class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</small>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <small class="ml-2" data-test="moderator-date">
+        {{ $d(new Date(message.createdAt), 'short') }}
+      </small>
+      <span class="ml-2 mr-2" data-test="moderator-name">
+        {{ message.userFirstName }} {{ message.userLastName }}
+      </span>
       <b-avatar square variant="warning"></b-avatar>
 
-      <parse-message v-bind="message"></parse-message>
+      <parse-message v-bind="message" data-test="moderator-message"></parse-message>
       <small v-if="isModeratorMessage">
         <hr />
         {{ $t('moderator.request') }}
@@ -20,9 +24,13 @@
     </div>
     <div v-else class="text-left is-user p-2 rounded-sm is-user-message mb-3">
       <b-avatar variant="info"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <small class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</small>
-      <parse-message v-bind="message"></parse-message>
+      <span class="ml-2 mr-2" data-test="user-name">
+        {{ message.userFirstName }} {{ message.userLastName }}
+      </span>
+      <small class="ml-2" data-test="user-date">
+        {{ $d(new Date(message.createdAt), 'short') }}
+      </small>
+      <parse-message v-bind="message" data-test="user-message"></parse-message>
     </div>
   </div>
 </template>
@@ -39,13 +47,14 @@ export default {
       type: Object,
       required: true,
     },
+    contributionUserId: {
+      type: Number,
+      required: true,
+    },
   },
   computed: {
     isModerator() {
-      return (
-        this.message.userFirstName === this.$store.state.moderator.firstName &&
-        this.message.userLastName === this.$store.state.moderator.lastName
-      )
+      return this.contributionUserId !== this.message.userId
     },
     isModeratorMessage() {
       return this.message.type === 'MODERATOR'
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 9d93eba60..33e9bb141 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -103,6 +103,7 @@
               <contribution-messages-list
                 :contributionId="row.item.id"
                 :contributionState="row.item.state"
+                :contributionUserId="row.item.userId"
                 @update-state="updateState"
               />
             </div>