diff --git a/resolvers/notifications.py b/resolvers/notifications.py
index e11277c6..0cfc2244 100644
--- a/resolvers/notifications.py
+++ b/resolvers/notifications.py
@@ -23,6 +23,7 @@ async def load_notifications(_, info, params=None):
         Notification.user == user_id
     ).order_by(desc(Notification.createdAt)).limit(limit).offset(offset)
 
+    notifications = []
     with local_session() as session:
         total_count = session.query(Notification).where(
             Notification.user == user_id
@@ -31,11 +32,13 @@ async def load_notifications(_, info, params=None):
         total_unread_count = session.query(Notification).where(
             and_(
                 Notification.user == user_id,
-                Notification.seen is False
+                Notification.seen == False
             )
         ).count()
 
-        notifications = session.execute(q).fetchall()
+        for [notification] in session.execute(q):
+            notification.type = notification.type.name
+            notifications.append(notification)
 
     return {
         "notifications": notifications,
diff --git a/schema.graphql b/schema.graphql
index 57147169..2a3af2d7 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -516,7 +516,7 @@ type Notification {
     id: Int!
     shout: Int
     reaction: Int
-    type: NotificationType
+    type: NotificationType!
     createdAt: DateTime!
     seen: Boolean!
     data: String # JSON
diff --git a/services/notifications/notification_service.py b/services/notifications/notification_service.py
index bfaf8e79..ad6c87e0 100644
--- a/services/notifications/notification_service.py
+++ b/services/notifications/notification_service.py
@@ -11,16 +11,29 @@ from orm.reaction import ReactionKind
 from services.notifications.sse import connection_manager
 
 
+def shout_to_shout_data(shout):
+    return {
+        "title": shout.title,
+        "slug": shout.slug
+    }
+
+
+def user_to_user_data(user):
+    return {
+        "id": user.id,
+        "name": user.name,
+        "slug": user.slug,
+        "userpic": user.userpic
+    }
+
+
 def update_prev_notification(notification, user):
     notification_data = json.loads(notification.data)
 
     notification_data["users"] = [
         user for user in notification_data["users"] if user['id'] != user.id
     ]
-    notification_data["users"].append({
-        "id": user.id,
-        "name": user.name
-    })
+    notification_data["users"].append(user_to_user_data(user))
 
     notification.data = json.dumps(notification_data, ensure_ascii=False)
     notification.seen = False
@@ -57,17 +70,13 @@ class NewReactionNotificator:
                             update_prev_notification(prev_new_reply_notification, user)
                         else:
                             reply_notification_data = json.dumps({
-                                "shout": {
-                                    "title": shout.title
-                                },
-                                "users": [
-                                    {"id": user.id, "name": user.name}
-                                ]
+                                "shout": shout_to_shout_data(shout),
+                                "users": [user_to_user_data(user)]
                             }, ensure_ascii=False)
 
                             reply_notification = Notification.create(**{
                                 "user": parent_reaction.createdBy,
-                                "type": NotificationType.NEW_REPLY.name,
+                                "type": NotificationType.NEW_REPLY,
                                 "shout": shout.id,
                                 "reaction": parent_reaction.id,
                                 "data": reply_notification_data
@@ -92,17 +101,13 @@ class NewReactionNotificator:
                         update_prev_notification(prev_new_comment_notification, user)
                     else:
                         notification_data_string = json.dumps({
-                            "shout": {
-                                "title": shout.title
-                            },
-                            "users": [
-                                {"id": user.id, "name": user.name}
-                            ]
+                            "shout": shout_to_shout_data(shout),
+                            "users": [user_to_user_data(user)]
                         }, ensure_ascii=False)
 
                         author_notification = Notification.create(**{
                             "user": shout.createdBy,
-                            "type": NotificationType.NEW_COMMENT.name,
+                            "type": NotificationType.NEW_COMMENT,
                             "shout": shout.id,
                             "data": notification_data_string
                         })