diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index d38f7fd08..31c373fc7 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -161,9 +161,6 @@ const permissions = shield(
       UpdatePost: isAuthor,
       DeletePost: isAuthor,
       report: isAuthenticated,
-      CreateBadge: isAdmin,
-      UpdateBadge: isAdmin,
-      DeleteBadge: isAdmin,
       CreateSocialMedia: isAuthenticated,
       DeleteSocialMedia: isAuthenticated,
       // AddBadgeRewarded: isAdmin,
diff --git a/backend/src/models/Badge.js b/backend/src/models/Badge.js
new file mode 100644
index 000000000..211d7a25b
--- /dev/null
+++ b/backend/src/models/Badge.js
@@ -0,0 +1,7 @@
+module.exports = {
+  key: { type: 'string', primary: true, lowercase: true },
+  status: { type: 'string', valid: ['permanent', 'temporary'] },
+  type: { type: 'string', valid: ['role', 'crowdfunding'] },
+  icon: { type: 'string', required: true },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+}
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index d8f768ae9..02ce04513 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -43,6 +43,12 @@ module.exports = {
     target: 'User',
     direction: 'in',
   },
+  rewarded: {
+    type: 'relationship',
+    relationship: 'REWARDED',
+    target: 'Badge',
+    direction: 'in',
+  },
   invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
   createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
   updatedAt: {
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index 0e6ae5864..09d1dbbeb 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -1,6 +1,7 @@
 // NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
 // module that is not browser-compatible. Node's `fs` module is server-side only
 export default {
+  Badge: require('./Badge.js'),
   User: require('./User.js'),
   InvitationCode: require('./InvitationCode.js'),
   EmailAddress: require('./EmailAddress.js'),
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 8fbb5cfda..0f724d9b5 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -12,11 +12,25 @@ export default applyScalars(
       resolvers,
       config: {
         query: {
-          exclude: ['InvitationCode', 'EmailAddress', 'Notfication', 'Statistics', 'LoggedInUser'],
+          exclude: [
+            'Badge',
+            'InvitationCode',
+            'EmailAddress',
+            'Notfication',
+            'Statistics',
+            'LoggedInUser',
+          ],
           // add 'User' here as soon as possible
         },
         mutation: {
-          exclude: ['InvitationCode', 'EmailAddress', 'Notfication', 'Statistics', 'LoggedInUser'],
+          exclude: [
+            'Badge',
+            'InvitationCode',
+            'EmailAddress',
+            'Notfication',
+            'Statistics',
+            'LoggedInUser',
+          ],
           // add 'User' here as soon as possible
         },
         debug: CONFIG.DEBUG,
diff --git a/backend/src/schema/resolvers/badges.js b/backend/src/schema/resolvers/badges.js
new file mode 100644
index 000000000..19bc24fd6
--- /dev/null
+++ b/backend/src/schema/resolvers/badges.js
@@ -0,0 +1,9 @@
+import { neo4jgraphql } from 'neo4j-graphql-js'
+
+export default {
+  Query: {
+    Badge: async (object, args, context, resolveInfo) => {
+      return neo4jgraphql(object, args, context, resolveInfo, false)
+    },
+  },
+}
diff --git a/backend/src/schema/resolvers/badges.spec.js b/backend/src/schema/resolvers/badges.spec.js
deleted file mode 100644
index a0dbafe00..000000000
--- a/backend/src/schema/resolvers/badges.spec.js
+++ /dev/null
@@ -1,200 +0,0 @@
-import { GraphQLClient } from 'graphql-request'
-import Factory from '../../seed/factories'
-import { host, login } from '../../jest/helpers'
-
-const factory = Factory()
-let client
-
-describe('badges', () => {
-  beforeEach(async () => {
-    await factory.create('User', {
-      email: 'user@example.org',
-      role: 'user',
-      password: '1234',
-    })
-    await factory.create('User', {
-      id: 'u2',
-      role: 'moderator',
-      email: 'moderator@example.org',
-    })
-    await factory.create('User', {
-      id: 'u3',
-      role: 'admin',
-      email: 'admin@example.org',
-    })
-  })
-
-  afterEach(async () => {
-    await factory.cleanDatabase()
-  })
-
-  describe('CreateBadge', () => {
-    const variables = {
-      id: 'b1',
-      key: 'indiegogo_en_racoon',
-      type: 'crowdfunding',
-      status: 'permanent',
-      icon: '/img/badges/indiegogo_en_racoon.svg',
-    }
-
-    const mutation = `
-      mutation(
-        $id: ID
-        $key: String!
-        $type: BadgeType!
-        $status: BadgeStatus!
-        $icon: String!
-      ) {
-        CreateBadge(id: $id, key: $key, type: $type, status: $status, icon: $icon) {
-          id,
-          key,
-          type,
-          status,
-          icon
-        }
-      }
-    `
-
-    describe('unauthenticated', () => {
-      it('throws authorization error', async () => {
-        client = new GraphQLClient(host)
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-
-    describe('authenticated admin', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'admin@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-      it('creates a badge', async () => {
-        const expected = {
-          CreateBadge: {
-            icon: '/img/badges/indiegogo_en_racoon.svg',
-            id: 'b1',
-            key: 'indiegogo_en_racoon',
-            status: 'permanent',
-            type: 'crowdfunding',
-          },
-        }
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
-      })
-    })
-
-    describe('authenticated moderator', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'moderator@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-
-      it('throws authorization error', async () => {
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-  })
-
-  describe('UpdateBadge', () => {
-    beforeEach(async () => {
-      await factory.authenticateAs({ email: 'admin@example.org', password: '1234' })
-      await factory.create('Badge', { id: 'b1' })
-    })
-    const variables = {
-      id: 'b1',
-      key: 'whatever',
-    }
-
-    const mutation = `
-      mutation($id: ID!, $key: String!) {
-        UpdateBadge(id: $id, key: $key) {
-          id
-          key
-        }
-      }
-    `
-
-    describe('unauthenticated', () => {
-      it('throws authorization error', async () => {
-        client = new GraphQLClient(host)
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-
-    describe('authenticated moderator', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'moderator@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-
-      it('throws authorization error', async () => {
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-
-    describe('authenticated admin', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'admin@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-      it('updates a badge', async () => {
-        const expected = {
-          UpdateBadge: {
-            id: 'b1',
-            key: 'whatever',
-          },
-        }
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
-      })
-    })
-  })
-
-  describe('DeleteBadge', () => {
-    beforeEach(async () => {
-      await factory.authenticateAs({ email: 'admin@example.org', password: '1234' })
-      await factory.create('Badge', { id: 'b1' })
-    })
-    const variables = {
-      id: 'b1',
-    }
-
-    const mutation = `
-      mutation($id: ID!) {
-        DeleteBadge(id: $id) {
-          id
-        }
-      }
-    `
-
-    describe('unauthenticated', () => {
-      it('throws authorization error', async () => {
-        client = new GraphQLClient(host)
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-
-    describe('authenticated moderator', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'moderator@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-
-      it('throws authorization error', async () => {
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-      })
-    })
-
-    describe('authenticated admin', () => {
-      beforeEach(async () => {
-        const headers = await login({ email: 'admin@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
-      })
-      it('deletes a badge', async () => {
-        const expected = {
-          DeleteBadge: {
-            id: 'b1',
-          },
-        }
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
-      })
-    })
-  })
-})
diff --git a/backend/src/schema/resolvers/rewards.js b/backend/src/schema/resolvers/rewards.js
index ec5043da3..cfad513ff 100644
--- a/backend/src/schema/resolvers/rewards.js
+++ b/backend/src/schema/resolvers/rewards.js
@@ -1,47 +1,47 @@
+import { neode } from '../../bootstrap/neo4j'
+import { UserInputError } from 'apollo-server'
+
+const instance = neode()
+
+const getUserAndBadge = async ({ badgeKey, userId }) => {
+  let user = await instance.first('User', 'id', userId)
+  const badge = await instance.first('Badge', 'key', badgeKey)
+  if (!user) throw new UserInputError("Couldn't find a user with that id")
+  if (!badge) throw new UserInputError("Couldn't find a badge with that key")
+  return { user, badge }
+}
+
 export default {
   Mutation: {
     reward: async (_object, params, context, _resolveInfo) => {
-      const { fromBadgeId, toUserId } = params
-      const session = context.driver.session()
-
-      let transactionRes = await session.run(
-        `MATCH (badge:Badge {id: $badgeId}), (rewardedUser:User {id: $rewardedUserId})
-          MERGE (badge)-[:REWARDED]->(rewardedUser)
-          RETURN rewardedUser {.id}`,
-        {
-          badgeId: fromBadgeId,
-          rewardedUserId: toUserId,
-        },
-      )
-
-      const [rewardedUser] = transactionRes.records.map(record => {
-        return record.get('rewardedUser')
-      })
-
-      session.close()
-
-      return rewardedUser.id
+      const { user, badge } = await getUserAndBadge(params)
+      await user.relateTo(badge, 'rewarded')
+      return user.toJson()
     },
 
     unreward: async (_object, params, context, _resolveInfo) => {
-      const { fromBadgeId, toUserId } = params
+      const { badgeKey, userId } = params
+      const { user } = await getUserAndBadge(params)
       const session = context.driver.session()
-
-      let transactionRes = await session.run(
-        `MATCH (badge:Badge {id: $badgeId})-[reward:REWARDED]->(rewardedUser:User {id: $rewardedUserId})
-        DELETE reward
-        RETURN rewardedUser {.id}`,
-        {
-          badgeId: fromBadgeId,
-          rewardedUserId: toUserId,
-        },
-      )
-      const [rewardedUser] = transactionRes.records.map(record => {
-        return record.get('rewardedUser')
-      })
-      session.close()
-
-      return rewardedUser.id
+      try {
+        // silly neode cannot remove relationships
+        await session.run(
+          `
+          MATCH (badge:Badge {key: $badgeKey})-[reward:REWARDED]->(rewardedUser:User {id: $userId})
+          DELETE reward
+          RETURN rewardedUser
+          `,
+          {
+            badgeKey,
+            userId,
+          },
+        )
+      } catch (err) {
+        throw err
+      } finally {
+        session.close()
+      }
+      return user.toJson()
     },
   },
 }
diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 2bdd9a39b..d835e2255 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -1,12 +1,20 @@
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../../seed/factories'
 import { host, login } from '../../jest/helpers'
+import gql from 'graphql-tag'
 
 const factory = Factory()
+let user
+let badge
 
 describe('rewards', () => {
+  const variables = {
+    from: 'indiegogo_en_rhino',
+    to: 'u1',
+  }
+
   beforeEach(async () => {
-    await factory.create('User', {
+    user = await factory.create('User', {
       id: 'u1',
       role: 'user',
       email: 'user@example.org',
@@ -22,8 +30,7 @@ describe('rewards', () => {
       role: 'admin',
       email: 'admin@example.org',
     })
-    await factory.create('Badge', {
-      id: 'b6',
+    badge = await factory.create('Badge', {
       key: 'indiegogo_en_rhino',
       type: 'crowdfunding',
       status: 'permanent',
@@ -35,21 +42,19 @@ describe('rewards', () => {
     await factory.cleanDatabase()
   })
 
-  describe('RewardBadge', () => {
-    const mutation = `
-      mutation(
-        $from: ID!
-        $to: ID!
-      ) {
-        reward(fromBadgeId: $from, toUserId: $to)
+  describe('reward', () => {
+    const mutation = gql`
+      mutation($from: ID!, $to: ID!) {
+        reward(badgeKey: $from, userId: $to) {
+          id
+          badges {
+            key
+          }
+        }
       }
     `
 
     describe('unauthenticated', () => {
-      const variables = {
-        from: 'b6',
-        to: 'u1',
-      }
       let client
 
       it('throws authorization error', async () => {
@@ -65,74 +70,94 @@ describe('rewards', () => {
         client = new GraphQLClient(host, { headers })
       })
 
+      describe('badge for key does not exist', () => {
+        it('rejects with a telling error message', async () => {
+          await expect(
+            client.request(mutation, {
+              ...variables,
+              from: 'bullshit',
+            }),
+          ).rejects.toThrow("Couldn't find a badge with that key")
+        })
+      })
+
+      describe('user for id does not exist', () => {
+        it('rejects with a telling error message', async () => {
+          await expect(
+            client.request(mutation, {
+              ...variables,
+              to: 'bullshit',
+            }),
+          ).rejects.toThrow("Couldn't find a user with that id")
+        })
+      })
+
       it('rewards a badge to user', async () => {
-        const variables = {
-          from: 'b6',
-          to: 'u1',
-        }
         const expected = {
-          reward: 'u1',
+          reward: {
+            id: 'u1',
+            badges: [{ key: 'indiegogo_en_rhino' }],
+          },
         }
         await expect(client.request(mutation, variables)).resolves.toEqual(expected)
       })
+
       it('rewards a second different badge to same user', async () => {
         await factory.create('Badge', {
-          id: 'b1',
           key: 'indiegogo_en_racoon',
-          type: 'crowdfunding',
-          status: 'permanent',
           icon: '/img/badges/indiegogo_en_racoon.svg',
         })
-        const variables = {
-          from: 'b1',
-          to: 'u1',
-        }
         const expected = {
-          reward: 'u1',
+          reward: {
+            id: 'u1',
+            badges: [{ key: 'indiegogo_en_racoon' }, { key: 'indiegogo_en_rhino' }],
+          },
         }
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
+        await client.request(mutation, variables)
+        await expect(
+          client.request(mutation, {
+            ...variables,
+            from: 'indiegogo_en_racoon',
+          }),
+        ).resolves.toEqual(expected)
       })
+
       it('rewards the same badge as well to another user', async () => {
-        const variables1 = {
-          from: 'b6',
-          to: 'u1',
-        }
-        await client.request(mutation, variables1)
-
-        const variables2 = {
-          from: 'b6',
-          to: 'u2',
-        }
         const expected = {
-          reward: 'u2',
+          reward: {
+            id: 'u2',
+            badges: [{ key: 'indiegogo_en_rhino' }],
+          },
         }
-        await expect(client.request(mutation, variables2)).resolves.toEqual(expected)
+        await expect(
+          client.request(mutation, {
+            ...variables,
+            to: 'u2',
+          }),
+        ).resolves.toEqual(expected)
       })
-      it('returns the original reward if a reward is attempted a second time', async () => {
-        const variables = {
-          from: 'b6',
-          to: 'u1',
-        }
+
+      it('creates no duplicate reward relationships', async () => {
         await client.request(mutation, variables)
         await client.request(mutation, variables)
 
-        const query = `{
-          User( id: "u1" ) {
-            badgesCount
+        const query = gql`
+          {
+            User(id: "u1") {
+              badgesCount
+              badges {
+                key
+              }
+            }
           }
-        }
         `
-        const expected = { User: [{ badgesCount: 1 }] }
+        const expected = { User: [{ badgesCount: 1, badges: [{ key: 'indiegogo_en_rhino' }] }] }
 
         await expect(client.request(query)).resolves.toEqual(expected)
       })
     })
 
     describe('authenticated moderator', () => {
-      const variables = {
-        from: 'b6',
-        to: 'u1',
-      }
       let client
       beforeEach(async () => {
         const headers = await login({ email: 'moderator@example.org', password: '1234' })
@@ -147,27 +172,41 @@ describe('rewards', () => {
     })
   })
 
-  describe('RemoveReward', () => {
+  describe('unreward', () => {
     beforeEach(async () => {
-      await factory.relate('User', 'Badges', { from: 'b6', to: 'u1' })
+      await user.relateTo(badge, 'rewarded')
     })
-    const variables = {
-      from: 'b6',
-      to: 'u1',
-    }
-    const expected = {
-      unreward: 'u1',
-    }
+    const expected = { unreward: { id: 'u1', badges: [] } }
 
-    const mutation = `
-      mutation(
-        $from: ID!
-        $to: ID!
-      ) {
-        unreward(fromBadgeId: $from, toUserId: $to)
+    const mutation = gql`
+      mutation($from: ID!, $to: ID!) {
+        unreward(badgeKey: $from, userId: $to) {
+          id
+          badges {
+            key
+          }
+        }
       }
     `
 
+    describe('check test setup', () => {
+      it('user has one badge', async () => {
+        const query = gql`
+          {
+            User(id: "u1") {
+              badgesCount
+              badges {
+                key
+              }
+            }
+          }
+        `
+        const expected = { User: [{ badgesCount: 1, badges: [{ key: 'indiegogo_en_rhino' }] }] }
+        const client = new GraphQLClient(host)
+        await expect(client.request(query)).resolves.toEqual(expected)
+      })
+    })
+
     describe('unauthenticated', () => {
       let client
 
@@ -188,12 +227,9 @@ describe('rewards', () => {
         await expect(client.request(mutation, variables)).resolves.toEqual(expected)
       })
 
-      it('fails to remove a not existing badge from user', async () => {
+      it('does not crash when unrewarding multiple times', async () => {
         await client.request(mutation, variables)
-
-        await expect(client.request(mutation, variables)).rejects.toThrow(
-          "Cannot read property 'id' of undefined",
-        )
+        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
       })
     })
 
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 2d9282b60..ea076d005 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -139,7 +139,7 @@ export default {
       organizationsCreated: '-[:CREATED_ORGA]->(related:Organization)',
       organizationsOwned: '-[:OWNING_ORGA]->(related:Organization)',
       categories: '-[:CATEGORIZED]->(related:Category)',
-      badges: '-[:REWARDED]->(related:Badge)',
+      badges: '<-[:REWARDED]-(related:Badge)',
     }),
   },
 }
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 6f9b6dd3d..fa83017da 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -147,7 +147,7 @@ describe('users', () => {
       }
     `
     beforeEach(async () => {
-      asAuthor = await factory.create('User', {
+      await factory.create('User', {
         email: 'test@example.org',
         password: '1234',
         id: 'u343',
@@ -191,6 +191,7 @@ describe('users', () => {
       describe('attempting to delete my own account', () => {
         let expectedResponse
         beforeEach(async () => {
+          asAuthor = Factory()
           await asAuthor.authenticateAs({
             email: 'test@example.org',
             password: '1234',
diff --git a/backend/src/schema/types/enum/BadgeStatus.gql b/backend/src/schema/types/enum/BadgeStatus.gql
deleted file mode 100644
index b109663b3..000000000
--- a/backend/src/schema/types/enum/BadgeStatus.gql
+++ /dev/null
@@ -1,4 +0,0 @@
-enum BadgeStatus {
-  permanent
-  temporary
-}
\ No newline at end of file
diff --git a/backend/src/schema/types/enum/BadgeType.gql b/backend/src/schema/types/enum/BadgeType.gql
deleted file mode 100644
index eccf2e661..000000000
--- a/backend/src/schema/types/enum/BadgeType.gql
+++ /dev/null
@@ -1,4 +0,0 @@
-enum BadgeType {
-  role
-  crowdfunding
-}
\ No newline at end of file
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 261501600..492dd3966 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -28,8 +28,6 @@ type Mutation {
   report(id: ID!, description: String): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
-  reward(fromBadgeId: ID!, toUserId: ID!): ID
-  unreward(fromBadgeId: ID!, toUserId: ID!): ID
   # Shout the given Type and ID
   shout(id: ID!, type: ShoutTypeEnum): Boolean!
   # Unshout the given Type and ID
diff --git a/backend/src/schema/types/schema_full.gql_ b/backend/src/schema/types/schema_full.gql_
index a581d287c..3454c8100 100644
--- a/backend/src/schema/types/schema_full.gql_
+++ b/backend/src/schema/types/schema_full.gql_
@@ -29,8 +29,8 @@ type Mutation {
   report(id: ID!, description: String): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
-  reward(fromBadgeId: ID!, toUserId: ID!): ID
-  unreward(fromBadgeId: ID!, toUserId: ID!): ID
+  reward(fromBadgeKey: ID!, toUserId: ID!): ID
+  unreward(fromBadgeKey: ID!, toUserId: ID!): ID
   # Shout the given Type and ID
   shout(id: ID!, type: ShoutTypeEnum): Boolean!
   # Unshout the given Type and ID
diff --git a/backend/src/schema/types/type/Badge.gql b/backend/src/schema/types/type/Badge.gql
index 68c5d5707..aac2960a0 100644
--- a/backend/src/schema/types/type/Badge.gql
+++ b/backend/src/schema/types/type/Badge.gql
@@ -1,6 +1,5 @@
 type Badge {
-  id: ID!
-  key: String!
+  key: ID!
   type: BadgeType!
   status: BadgeStatus!
   icon: String!
@@ -10,4 +9,23 @@ type Badge {
   updatedAt: String
 
   rewarded: [User]! @relation(name: "REWARDED", direction: "OUT")
-}
\ No newline at end of file
+}
+
+enum BadgeStatus {
+  permanent
+  temporary
+}
+
+enum BadgeType {
+  role
+  crowdfunding
+}
+
+type Query {
+  Badge: [Badge]
+}
+
+type Mutation {
+  reward(badgeKey: ID!, userId: ID!): User
+  unreward(badgeKey: ID!, userId: ID!): User
+}
diff --git a/backend/src/seed/factories/badges.js b/backend/src/seed/factories/badges.js
index 6414e9f36..5f0482460 100644
--- a/backend/src/seed/factories/badges.js
+++ b/backend/src/seed/factories/badges.js
@@ -1,28 +1,15 @@
-import uuid from 'uuid/v4'
-
-export default function(params) {
-  const {
-    id = uuid(),
-    key = '',
-    type = 'crowdfunding',
-    status = 'permanent',
-    icon = '/img/badges/indiegogo_en_panda.svg',
-  } = params
-
+export default function create() {
   return {
-    mutation: `
-      mutation(
-        $id: ID
-        $key: String!
-        $type: BadgeType!
-        $status: BadgeStatus!
-        $icon: String!
-      ) {
-        CreateBadge(id: $id, key: $key, type: $type, status: $status, icon: $icon) {
-          id
-        }
+    factory: async ({ args, neodeInstance }) => {
+      const defaults = {
+        type: 'crowdfunding',
+        status: 'permanent',
       }
-    `,
-    variables: { id, key, type, status, icon },
+      args = {
+        ...defaults,
+        ...args,
+      }
+      return neodeInstance.create('Badge', args)
+    },
   }
 }
diff --git a/backend/src/seed/factories/index.js b/backend/src/seed/factories/index.js
index b2cf2de45..e841b0beb 100644
--- a/backend/src/seed/factories/index.js
+++ b/backend/src/seed/factories/index.js
@@ -73,6 +73,7 @@ export default function Factory(options = {}) {
       const { factory, mutation, variables } = this.factories[node](args)
       if (factory) {
         this.lastResponse = await factory({ args, neodeInstance })
+        return this.lastResponse
       } else {
         this.lastResponse = await this.graphQLClient.request(mutation, variables)
       }
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index ffe8e7a39..8bdf03b9f 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -3,7 +3,7 @@ import uuid from 'uuid/v4'
 import encryptPassword from '../../helpers/encryptPassword'
 import slugify from 'slug'
 
-export default function create(params) {
+export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
       const defaults = {
@@ -21,8 +21,7 @@ export default function create(params) {
         ...args,
       }
       args = await encryptPassword(args)
-      const user = await neodeInstance.create('User', args)
-      return user.toJson()
+      return neodeInstance.create('User', args)
     },
   }
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 18eefb76f..14258ec85 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -5,52 +5,42 @@ import Factory from './factories'
 ;(async function() {
   try {
     const f = Factory()
-    await Promise.all([
+    const [racoon, rabbit, wolf, bear, turtle, rhino] = await Promise.all([
       f.create('Badge', {
-        id: 'b1',
         key: 'indiegogo_en_racoon',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_racoon.svg',
       }),
       f.create('Badge', {
-        id: 'b2',
         key: 'indiegogo_en_rabbit',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_rabbit.svg',
       }),
       f.create('Badge', {
-        id: 'b3',
         key: 'indiegogo_en_wolf',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_wolf.svg',
       }),
       f.create('Badge', {
-        id: 'b4',
         key: 'indiegogo_en_bear',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_bear.svg',
       }),
       f.create('Badge', {
-        id: 'b5',
         key: 'indiegogo_en_turtle',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_turtle.svg',
       }),
       f.create('Badge', {
-        id: 'b6',
         key: 'indiegogo_en_rhino',
-        type: 'crowdfunding',
-        status: 'permanent',
         icon: '/img/badges/indiegogo_en_rhino.svg',
       }),
     ])
 
-    await Promise.all([
+    const [
+      peterLustig,
+      bobDerBaumeister,
+      jennyRostock,
+      tick, // eslint-disable-line no-unused-vars
+      trick, // eslint-disable-line no-unused-vars
+      track, // eslint-disable-line no-unused-vars
+      dagobert,
+    ] = await Promise.all([
       f.create('User', {
         id: 'u1',
         name: 'Peter Lustig',
@@ -123,30 +113,16 @@ import Factory from './factories'
     ])
 
     await Promise.all([
-      f.relate('User', 'Badges', {
-        from: 'b6',
-        to: 'u1',
-      }),
-      f.relate('User', 'Badges', {
-        from: 'b5',
-        to: 'u2',
-      }),
-      f.relate('User', 'Badges', {
-        from: 'b4',
-        to: 'u3',
-      }),
-      f.relate('User', 'Badges', {
-        from: 'b3',
-        to: 'u4',
-      }),
-      f.relate('User', 'Badges', {
-        from: 'b2',
-        to: 'u5',
-      }),
-      f.relate('User', 'Badges', {
-        from: 'b1',
-        to: 'u6',
-      }),
+      peterLustig.relateTo(racoon, 'rewarded'),
+      peterLustig.relateTo(rhino, 'rewarded'),
+      peterLustig.relateTo(wolf, 'rewarded'),
+      bobDerBaumeister.relateTo(racoon, 'rewarded'),
+      bobDerBaumeister.relateTo(turtle, 'rewarded'),
+      jennyRostock.relateTo(bear, 'rewarded'),
+      dagobert.relateTo(rabbit, 'rewarded'),
+    ])
+
+    await Promise.all([
       f.relate('User', 'Friends', {
         from: 'u1',
         to: 'u2',
diff --git a/webapp/graphql/CommentQuery.js b/webapp/graphql/CommentQuery.js
index 0e61a8a6c..fef5e74c1 100644
--- a/webapp/graphql/CommentQuery.js
+++ b/webapp/graphql/CommentQuery.js
@@ -24,7 +24,6 @@ export default app => {
             name: name${lang}
           }
           badges {
-            id
             key
             icon
           }
diff --git a/webapp/graphql/PostCommentsQuery.js b/webapp/graphql/PostCommentsQuery.js
index bbdfa1178..e3a5ce858 100644
--- a/webapp/graphql/PostCommentsQuery.js
+++ b/webapp/graphql/PostCommentsQuery.js
@@ -28,7 +28,6 @@ export default i18n => {
               name: name${lang}
             }
             badges {
-              id
               key
               icon
             }
diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js
index 240f718ae..31444ae0c 100644
--- a/webapp/graphql/PostQuery.js
+++ b/webapp/graphql/PostQuery.js
@@ -29,7 +29,6 @@ export default i18n => {
               name: name${lang}
             }
             badges {
-              id
               key
               icon
             }
@@ -60,7 +59,6 @@ export default i18n => {
                 name: name${lang}
               }
               badges {
-                id
                 key
                 icon
               }
diff --git a/webapp/graphql/UserProfile/User.js b/webapp/graphql/UserProfile/User.js
index 5bfe0510f..19bf5c6e9 100644
--- a/webapp/graphql/UserProfile/User.js
+++ b/webapp/graphql/UserProfile/User.js
@@ -18,7 +18,6 @@ export default i18n => {
         }
         createdAt
         badges {
-          id
           key
           icon
         }
@@ -38,7 +37,6 @@ export default i18n => {
           contributionsCount
           commentsCount
           badges {
-            id
             key
             icon
           }
@@ -60,7 +58,6 @@ export default i18n => {
           contributionsCount
           commentsCount
           badges {
-            id
             key
             icon
           }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5769f1828..3a51e9f8e 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -156,7 +156,6 @@ export default {
                   name: name${this.$i18n.locale().toUpperCase()}
                 }
                 badges {
-                  id
                   key
                   icon
                 }
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 167926e95..8495c5a5b 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -110,7 +110,6 @@ export default {
                     name: name${this.$i18n.locale().toUpperCase()}
                   }
                   badges {
-                    id
                     key
                     icon
                   }