diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index acb83b028..931295c35 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -1,16 +1,16 @@
 <template>
   <article :class="{ '--read': notification.read, notification: true }">
     <client-only>
-      <user-teaser :user="from.author" :date-time="from.createdAt" />
+      <user-teaser :user="isGroup ? to : from.author" :date-time="from.createdAt" />
     </client-only>
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
       class="link"
-      :to="{ name: 'post-id-slug', params, ...hashParam }"
+      :to="{ name: isGroup ? 'group' : 'post-id-slug', params, hashParam }"
       @click.native="$emit('read')"
     >
       <base-card wideContent>
-        <h2 class="title">{{ from.title || from.post.title }}</h2>
+        <h2 class="title">{{ from.title || from.groupName || from.post.title }}</h2>
         <p>
           <strong v-if="isComment" class="comment">{{ $t(`notifications.comment`) }}:</strong>
           {{ from.contentExcerpt | removeHtml }}
@@ -38,14 +38,20 @@ export default {
     from() {
       return this.notification.from
     },
+    to() {
+      return this.notification.to
+    },
     isComment() {
       return this.from.__typename === 'Comment'
     },
+    isGroup() {
+      return this.from.__typename === 'Group'
+    },
     params() {
-      const post = this.isComment ? this.from.post : this.from
+      const target = this.isComment ? this.from.post : this.from
       return {
-        id: post.id,
-        slug: post.slug,
+        id: target.id,
+        slug: target.slug,
       }
     },
     hashParam() {
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index a9e58a719..4aff0baaf 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -6,6 +6,7 @@ import {
   userFragment,
   postFragment,
   commentFragment,
+  groupFragment,
 } from './Fragments'
 
 export const profileUserQuery = (i18n) => {
@@ -113,6 +114,7 @@ export const notificationQuery = (_i18n) => {
     ${userFragment}
     ${commentFragment}
     ${postFragment}
+    ${groupFragment}
 
     query ($read: Boolean, $orderBy: NotificationOrdering, $first: Int, $offset: Int) {
       notifications(read: $read, orderBy: $orderBy, first: $first, offset: $offset) {
@@ -121,6 +123,9 @@ export const notificationQuery = (_i18n) => {
         reason
         createdAt
         updatedAt
+        to {
+          ...user
+        }
         from {
           __typename
           ... on Post {
@@ -141,6 +146,9 @@ export const notificationQuery = (_i18n) => {
               }
             }
           }
+          ... on Group {
+            ...group
+          }
         }
       }
     }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f4ad97d01..830b9efc7 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -649,7 +649,8 @@
     "reason": {
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
-      "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …"
+      "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …",
+      "user_joined_group": "Ist Deiner Gruppe beigetreten …"
     },
     "title": "Benachrichtigungen",
     "user": "Nutzer"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d44625b7f..7e8e0bbaa 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -649,7 +649,8 @@
     "reason": {
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
-      "mentioned_in_post": "Mentioned you in a post …"
+      "mentioned_in_post": "Mentioned you in a post …",
+      "user_joined_group": "Joined your group …"
     },
     "title": "Notifications",
     "user": "User"