diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 15fc4f78d..1582bd542 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-formular">
-    <div>
+    <div class="mt-5">
       <b-form @submit.prevent="onSubmit" @reset.prevent="onReset">
         <b-form-textarea
           id="textarea"
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 7ee0134ac..fa5bdd940 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-moderator v-if="isModerator" :message="message"></is-moderator>
+    <is-moderator v-if="message.isModerator" :message="message"></is-moderator>
     <is-not-moderator v-else :message="message"></is-not-moderator>
   </div>
 </template>
@@ -23,10 +23,5 @@ export default {
       },
     },
   },
-  computed: {
-    isModerator() {
-      return this.$store.state.moderator.id === this.message.userId
-    },
-  },
 }
 </script>
diff --git a/admin/src/components/ContributionMessages/slots/IsModerator.vue b/admin/src/components/ContributionMessages/slots/IsModerator.vue
index 37db5402e..0224e042f 100644
--- a/admin/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsModerator.vue
@@ -5,7 +5,7 @@
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
       <small class="ml-4 text-success">{{ $t('moderator') }}</small>
-      <div class="mt-2 text-bold h4">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>
diff --git a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
index 8828fe5b0..64946c557 100644
--- a/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/admin/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,11 +2,9 @@
   <div class="slot-is-not-moderator">
     <div>
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">
-        {{ message.userFirstName }} {{ message.userLastName }}
-      </span>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2 text-bold h4">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index 2ae5943fa..c3ffdb0b9 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -18,6 +18,7 @@ export const listContributionMessages = gql`
         userFirstName
         userLastName
         userId
+        isModerator
       }
     }
   }
diff --git a/backend/package.json b/backend/package.json
index d31d12eda..858aa1328 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,8 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
+    "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts
new file mode 100644
index 000000000..c8f83acc3
--- /dev/null
+++ b/backend/src/util/klicktipp.ts
@@ -0,0 +1,28 @@
+import connection from '@/typeorm/connection'
+import { getKlickTippUser } from '@/apis/KlicktippController'
+import { User } from '@entity/User'
+
+export async function retrieveNotRegisteredEmails(): Promise<string[]> {
+  const con = await connection()
+  if (!con) {
+    throw new Error('No connection to database')
+  }
+  const users = await User.find()
+  const notRegisteredUser = []
+  for (let i = 0; i < users.length; i++) {
+    const user = users[i]
+    try {
+      await getKlickTippUser(user.email)
+    } catch (err) {
+      notRegisteredUser.push(user.email)
+      // eslint-disable-next-line no-console
+      console.log(`${user.email}`)
+    }
+  }
+  await con.close()
+  // eslint-disable-next-line no-console
+  console.log('User die nicht bei KlickTipp vorhanden sind: ', notRegisteredUser)
+  return notRegisteredUser
+}
+
+retrieveNotRegisteredEmails()
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 6530a5a53..5f1c03b22 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -7,7 +7,6 @@
     </b-container>
     <contribution-messages-formular
       v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
-      class="mt-5"
       :contributionId="contributionId"
       @get-list-contribution-messages="getListContributionMessages"
       @update-state="updateState"
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 2c7e20793..343b92d97 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -4,7 +4,7 @@
     <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
     <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
     <small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
-    <div class="mt-2 h3">{{ message.message }}</div>
+    <div class="mt-2">{{ message.message }}</div>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 0f67f8bfc..8efca7270 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,11 +2,9 @@
   <div class="slot-is-not-moderator">
     <div class="text-right">
       <b-avatar :text="initialLetters" variant="info"></b-avatar>
-      <span class="ml-2 mr-2 text-bold">
-        {{ message.userFirstName }} {{ message.userLastName }}
-      </span>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
       <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <div class="mt-2 h3">{{ message.message }}</div>
+      <div class="mt-2">{{ message.message }}</div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 25aa00468..d147965f6 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -27,10 +27,7 @@
             </span>
           </div>
           <div class="mr-2">{{ memo }}</div>
-          <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(state) && !firstName"
-            class="d-flex flex-row-reverse"
-          >
+          <div class="d-flex flex-row-reverse">
             <div
               v-if="!['CONFIRMED', 'DELETED'].includes(state)"
               class="pointer ml-5"