diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 381d2ce43..5af22d257 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -21,6 +21,7 @@ const mocks = {
       moderator: {
         id: 0,
         name: 'test moderator',
+        roles: ['ADMIN'],
       },
     },
   },
@@ -45,7 +46,7 @@ describe('ChangeUserRoleFormular', () => {
         propsData = {
           item: {
             userId: 1,
-            isAdmin: null,
+            roles: [],
           },
         }
         wrapper = Wrapper()
@@ -61,7 +62,7 @@ describe('ChangeUserRoleFormular', () => {
         propsData = {
           item: {
             userId: 0,
-            isAdmin: null,
+            roles: ['ADMIN'],
           },
         }
         wrapper = Wrapper()
@@ -88,7 +89,7 @@ describe('ChangeUserRoleFormular', () => {
           propsData = {
             item: {
               userId: 1,
-              isAdmin: null,
+              roles: [],
             },
           }
           wrapper = Wrapper()
@@ -120,13 +121,13 @@ describe('ChangeUserRoleFormular', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
-              setUserRole: new Date(),
+              setUserRole: 'ADMIN',
             },
           })
           propsData = {
             item: {
               userId: 1,
-              isAdmin: null,
+              roles: ['USER'],
             },
           }
           wrapper = Wrapper()
@@ -134,7 +135,7 @@ describe('ChangeUserRoleFormular', () => {
         })
 
         it('has selected option set to "usual user"', () => {
-          expect(wrapper.find('select.role-select').element.value).toBe('user')
+          expect(wrapper.find('select.role-select').element.value).toBe('USER')
         })
 
         describe('change select to', () => {
@@ -149,7 +150,7 @@ describe('ChangeUserRoleFormular', () => {
             })
           })
 
-          describe('new role', () => {
+          describe('new role "MODERATOR"', () => {
             beforeEach(() => {
               rolesToSelect.at(1).setSelected()
             })
@@ -181,19 +182,267 @@ describe('ChangeUserRoleFormular', () => {
                       mutation: setUserRole,
                       variables: {
                         userId: 1,
-                        isAdmin: true,
+                        role: 'MODERATOR',
                       },
                     }),
                   )
                 })
 
-                it('emits "updateIsAdmin"', () => {
-                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                it('emits "updateRoles" with role moderator', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
                     expect.arrayContaining([
                       expect.arrayContaining([
                         {
                           userId: 1,
-                          isAdmin: expect.any(Date),
+                          roles: ['MODERATOR'],
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
+
+          describe('new role "ADMIN"', () => {
+            beforeEach(() => {
+              rolesToSelect.at(2).setSelected()
+            })
+
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        role: 'ADMIN',
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateRoles" with role moderator', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          roles: ['ADMIN'],
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
+        })
+      })
+
+      describe('user has role "moderator"', () => {
+        beforeEach(() => {
+          apolloMutateMock.mockResolvedValue({
+            data: {
+              setUserRole: null,
+            },
+          })
+          propsData = {
+            item: {
+              userId: 1,
+              roles: ['MODERATOR'],
+            },
+          }
+          wrapper = Wrapper()
+          rolesToSelect = wrapper.find('select.role-select').findAll('option')
+        })
+
+        it('has selected option set to "MODERATOR"', () => {
+          expect(wrapper.find('select.role-select').element.value).toBe('MODERATOR')
+        })
+
+        describe('change select to', () => {
+          describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
+            it('does not call the API', () => {
+              rolesToSelect.at(1).setSelected()
+              expect(apolloMutateMock).not.toHaveBeenCalled()
+            })
+          })
+
+          describe('new role "USER"', () => {
+            beforeEach(() => {
+              rolesToSelect.at(0).setSelected()
+            })
+
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        role: 'USER',
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateRoles"', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          roles: [],
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
+
+          describe('new role "ADMIN"', () => {
+            beforeEach(() => {
+              rolesToSelect.at(2).setSelected()
+            })
+
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        role: 'ADMIN',
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateRoles"', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          roles: ['ADMIN'],
                         },
                       ]),
                     ]),
@@ -232,7 +481,7 @@ describe('ChangeUserRoleFormular', () => {
           propsData = {
             item: {
               userId: 1,
-              isAdmin: new Date(),
+              roles: ['ADMIN'],
             },
           }
           wrapper = Wrapper()
@@ -240,7 +489,7 @@ describe('ChangeUserRoleFormular', () => {
         })
 
         it('has selected option set to "admin"', () => {
-          expect(wrapper.find('select.role-select').element.value).toBe('admin')
+          expect(wrapper.find('select.role-select').element.value).toBe('ADMIN')
         })
 
         describe('change select to', () => {
@@ -251,11 +500,12 @@ describe('ChangeUserRoleFormular', () => {
 
             it('does not call the API', () => {
               rolesToSelect.at(1).setSelected()
+              // TODO: Fix this
               expect(apolloMutateMock).not.toHaveBeenCalled()
             })
           })
 
-          describe('new role', () => {
+          describe('new role "USER"', () => {
             beforeEach(() => {
               rolesToSelect.at(0).setSelected()
             })
@@ -287,19 +537,90 @@ describe('ChangeUserRoleFormular', () => {
                       mutation: setUserRole,
                       variables: {
                         userId: 1,
-                        isAdmin: false,
+                        role: 'USER',
                       },
                     }),
                   )
                 })
 
-                it('emits "updateIsAdmin"', () => {
-                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                it('emits "updateRoles"', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
                     expect.arrayContaining([
                       expect.arrayContaining([
                         {
                           userId: 1,
-                          isAdmin: null,
+                          roles: [],
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
+
+          describe('new role "MODERATOR"', () => {
+            beforeEach(() => {
+              rolesToSelect.at(1).setSelected()
+            })
+
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        role: 'MODERATOR',
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateRoles"', () => {
+                  expect(wrapper.emitted('updateRoles')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          roles: ['MODERATOR'],
                         },
                       ]),
                     ]),
@@ -328,5 +649,23 @@ describe('ChangeUserRoleFormular', () => {
         })
       })
     })
+
+    describe('authenticated user is MODERATOR', () => {
+      beforeEach(() => {
+        mocks.$store.state.moderator.roles = ['MODERATOR']
+      })
+
+      it('displays text with role', () => {
+        expect(wrapper.text()).toBe('userRole.selectRoles.admin')
+      })
+
+      it('has no role select', () => {
+        expect(wrapper.find('select.role-select').exists()).toBe(false)
+      })
+
+      it('has no button', () => {
+        expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
+      })
+    })
   })
 })
diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 677a12f56..7f048d0e2 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="change-user-role-formular">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div v-if="item.userId === $store.state.moderator.id" class="m-3 mb-4">
+      <div v-if="!$store.state.moderator.roles.includes('ADMIN')" class="m-3 mb-4">
+        {{ roles.find((role) => role.value === currentRole).text }}
+      </div>
+      <div v-else-if="item.userId === $store.state.moderator.id" class="m-3 mb-4">
         {{ $t('userRole.notChangeYourSelf') }}
       </div>
       <div v-else class="m-3">
@@ -25,8 +28,9 @@
 import { setUserRole } from '../graphql/setUserRole'
 
 const rolesValues = {
-  admin: 'admin',
-  user: 'user',
+  ADMIN: 'ADMIN',
+  MODERATOR: 'MODERATOR',
+  USER: 'USER',
 }
 
 export default {
@@ -39,23 +43,30 @@ export default {
   },
   data() {
     return {
-      currentRole: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
-      roleSelected: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
+      currentRole: this.getCurrentRole(),
+      roleSelected: this.getCurrentRole(),
       roles: [
-        { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
-        { value: rolesValues.admin, text: this.$t('userRole.selectRoles.admin') },
+        { value: rolesValues.USER, text: this.$t('userRole.selectRoles.user') },
+        { value: rolesValues.MODERATOR, text: this.$t('userRole.selectRoles.moderator') },
+        { value: rolesValues.ADMIN, text: this.$t('userRole.selectRoles.admin') },
       ],
     }
   },
   methods: {
+    getCurrentRole() {
+      if (this.item.roles.length) return rolesValues[this.item.roles[0]]
+      return rolesValues.USER
+    },
     showModal() {
       this.$bvModal
         .msgBoxConfirm(
           this.$t('overlay.changeUserRole.question', {
             username: `${this.item.firstName} ${this.item.lastName}`,
             newRole:
-              this.roleSelected === 'admin'
+              this.roleSelected === rolesValues.ADMIN
                 ? this.$t('userRole.selectRoles.admin')
+                : this.roleSelected === rolesValues.MODERATOR
+                ? this.$t('userRole.selectRoles.moderator')
                 : this.$t('userRole.selectRoles.user'),
           }),
           {
@@ -77,25 +88,27 @@ export default {
         })
     },
     setUserRole(newRole, oldRole) {
+      const role = this.roles.find((role) => {
+        return role.value === newRole
+      })
+      const roleText = role.text
+      const roleValue = role.value
       this.$apollo
         .mutate({
           mutation: setUserRole,
           variables: {
             userId: this.item.userId,
-            isAdmin: newRole === rolesValues.admin,
+            role: role.value,
           },
         })
         .then((result) => {
-          this.$emit('updateIsAdmin', {
+          this.$emit('updateRoles', {
             userId: this.item.userId,
-            isAdmin: result.data.setUserRole,
+            roles: roleValue === 'USER' ? [] : [roleValue],
           })
           this.toastSuccess(
             this.$t('userRole.successfullyChangedTo', {
-              role:
-                result.data.setUserRole !== null
-                  ? this.$t('userRole.selectRoles.admin')
-                  : this.$t('userRole.selectRoles.user'),
+              role: roleText,
             }),
           )
         })
diff --git a/admin/src/components/Tables/SearchUserTable.spec.js b/admin/src/components/Tables/SearchUserTable.spec.js
index 20eeb9dad..a2d30e48a 100644
--- a/admin/src/components/Tables/SearchUserTable.spec.js
+++ b/admin/src/components/Tables/SearchUserTable.spec.js
@@ -15,6 +15,7 @@ const propsData = {
       email: 'bibi@bloxberg.de',
       creation: [200, 400, 600],
       emailChecked: true,
+      roles: [],
     },
     {
       userId: 2,
@@ -23,6 +24,7 @@ const propsData = {
       email: 'benjamin@bluemchen.de',
       creation: [1000, 1000, 1000],
       emailChecked: true,
+      roles: [],
     },
     {
       userId: 3,
@@ -31,6 +33,7 @@ const propsData = {
       email: 'peter@lustig.de',
       creation: [0, 0, 0],
       emailChecked: true,
+      roles: ['ADMIN'],
     },
     {
       userId: 4,
@@ -39,6 +42,7 @@ const propsData = {
       email: 'new@user.ch',
       creation: [1000, 1000, 1000],
       emailChecked: false,
+      roles: [],
     },
   ],
   fields: [
@@ -68,6 +72,7 @@ const mocks = {
       moderator: {
         id: 0,
         name: 'test moderator',
+        roles: ['ADMIN'],
       },
     },
   },
@@ -96,14 +101,14 @@ describe('SearchUserTable', () => {
 
       describe('isAdmin', () => {
         beforeEach(async () => {
-          await wrapper.find('div.change-user-role-formular').vm.$emit('updateIsAdmin', {
+          await wrapper.find('div.change-user-role-formular').vm.$emit('updateRoles', {
             userId: 1,
-            isAdmin: new Date(),
+            roles: ['ADMIN'],
           })
         })
 
         it('emits updateIsAdmin', () => {
-          expect(wrapper.emitted('updateIsAdmin')).toEqual([[1, expect.any(Date)]])
+          expect(wrapper.emitted('updateRoles')).toEqual([[1, ['ADMIN']]])
         })
       })
 
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 25d807c83..c2f023292 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -79,9 +79,9 @@
               <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
             <b-tab :title="$t('userRole.tabTitle')">
-              <change-user-role-formular :item="row.item" @updateIsAdmin="updateIsAdmin" />
+              <change-user-role-formular :item="row.item" @updateRoles="updateRoles" />
             </b-tab>
-            <b-tab :title="$t('delete_user')">
+            <b-tab v-if="$store.state.moderator.roles.includes('ADMIN')" :title="$t('delete_user')">
               <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
             </b-tab>
           </b-tabs>
@@ -127,8 +127,8 @@ export default {
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation
     },
-    updateIsAdmin({ userId, isAdmin }) {
-      this.$emit('updateIsAdmin', userId, isAdmin)
+    updateRoles({ userId, roles }) {
+      this.$emit('updateRoles', userId, roles)
     },
     updateDeletedAt({ userId, deletedAt }) {
       this.$emit('updateDeletedAt', userId, deletedAt)
diff --git a/admin/src/components/UserQuery.spec.js b/admin/src/components/UserQuery.spec.js
new file mode 100644
index 000000000..92fdd2413
--- /dev/null
+++ b/admin/src/components/UserQuery.spec.js
@@ -0,0 +1,47 @@
+import { mount } from '@vue/test-utils'
+import UserQuery from './UserQuery'
+
+const localVue = global.localVue
+
+const propsData = {
+  userId: 42,
+}
+const mocks = {
+  $t: jest.fn((t) => t),
+}
+describe('TransactionLinkList', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(UserQuery, { mocks, localVue, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has div .input-group', () => {
+      expect(wrapper.find('div .input-group').exists()).toBe(true)
+    })
+
+    it('has .test-input-criteria', () => {
+      expect(wrapper.find('input.test-input-criteria').exists()).toBe(true)
+    })
+
+    describe('set value', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
+        await wrapper.find('input.test-input-criteria').setValue('Test2')
+      })
+
+      it('emits input', () => {
+        expect(wrapper.emitted('input')).toBeTruthy()
+      })
+
+      it('emits input with value "Test2"', () => {
+        expect(wrapper.emitted('input')).toEqual([['Test2']])
+      })
+    })
+  })
+})
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 15fb8da32..9f82452c3 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -26,7 +26,7 @@ export const searchUsers = gql`
         hasElopage
         emailConfirmationSend
         deletedAt
-        isAdmin
+        roles
       }
     }
   }
diff --git a/admin/src/graphql/setUserRole.js b/admin/src/graphql/setUserRole.js
index 8cdcab396..8df86da6b 100644
--- a/admin/src/graphql/setUserRole.js
+++ b/admin/src/graphql/setUserRole.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const setUserRole = gql`
-  mutation ($userId: Int!, $isAdmin: Boolean!) {
-    setUserRole(userId: $userId, isAdmin: $isAdmin)
+  mutation ($userId: Int!, $role: RoleNames!) {
+    setUserRole(userId: $userId, role: $role)
   }
 `
diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js
index ea08bb5b1..ce9e96ffc 100644
--- a/admin/src/graphql/verifyLogin.js
+++ b/admin/src/graphql/verifyLogin.js
@@ -5,7 +5,7 @@ export const verifyLogin = gql`
     verifyLogin {
       firstName
       lastName
-      isAdmin
+      roles
       id
       language
     }
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 1f5e41fbe..d4209ce83 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -209,6 +209,7 @@
     "selectLabel": "Rolle:",
     "selectRoles": {
       "admin": "Administrator",
+      "moderator": "Moderator",
       "user": "einfacher Nutzer"
     },
     "successfullyChangedTo": "Nutzer ist jetzt „{role}“.",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 99c438365..35aacfa69 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -209,6 +209,7 @@
     "selectLabel": "Role:",
     "selectRoles": {
       "admin": "administrator",
+      "moderator": "moderator",
       "user": "usual user"
     },
     "successfullyChangedTo": "User is now \"{role}\".",
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 9e1ddb4a4..44ba4a1c4 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -28,7 +28,7 @@ const mocks = {
       moderator: {
         firstName: 'Peter',
         lastName: 'Lustig',
-        isAdmin: '2022-08-30T07:41:31.000Z',
+        roles: ['ADMIN'],
         id: 263,
         language: 'de',
       },
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 7979ed6d0..09540b85a 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -16,6 +16,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           email: 'new@user.ch',
           creation: [1000, 1000, 1000],
           emailChecked: false,
+          roles: [],
           deletedAt: null,
         },
         {
@@ -24,6 +25,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           lastName: 'Lustig',
           email: 'peter@lustig.de',
           creation: [0, 0, 0],
+          roles: ['ADMIN'],
           emailChecked: true,
           deletedAt: null,
         },
@@ -33,6 +35,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           lastName: 'Blümchen',
           email: 'benjamin@bluemchen.de',
           creation: [1000, 1000, 1000],
+          roles: [],
           emailChecked: true,
           deletedAt: new Date(),
         },
@@ -42,6 +45,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           lastName: 'Bloxberg',
           email: 'bibi@bloxberg.de',
           creation: [200, 400, 600],
+          roles: [],
           emailChecked: true,
           deletedAt: null,
         },
@@ -212,10 +216,10 @@ describe('UserSearch', () => {
         it('updates user role to admin', async () => {
           await wrapper
             .findComponent({ name: 'SearchUserTable' })
-            .vm.$emit('updateIsAdmin', userId, new Date())
-          expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).isAdmin).toEqual(
-            expect.any(Date),
-          )
+            .vm.$emit('updateRoles', userId, ['ADMIN'])
+          expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([
+            'ADMIN',
+          ])
         })
       })
 
@@ -223,8 +227,8 @@ describe('UserSearch', () => {
         it('updates user role to usual user', async () => {
           await wrapper
             .findComponent({ name: 'SearchUserTable' })
-            .vm.$emit('updateIsAdmin', userId, null)
-          expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).isAdmin).toEqual(null)
+            .vm.$emit('updateRoles', userId, [])
+          expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([])
         })
       })
     })
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 95b9a6833..58f5d009e 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -28,7 +28,7 @@
       type="PageUserSearch"
       :items="searchResult"
       :fields="fields"
-      @updateIsAdmin="updateIsAdmin"
+      @updateRoles="updateRoles"
       @updateDeletedAt="updateDeletedAt"
     />
     <b-pagination
@@ -101,8 +101,8 @@ export default {
           this.toastError(error.message)
         })
     },
-    updateIsAdmin(userId, isAdmin) {
-      this.searchResult.find((obj) => obj.userId === userId).isAdmin = isAdmin
+    updateRoles(userId, roles) {
+      this.searchResult.find((obj) => obj.userId === userId).roles = roles
     },
     updateDeletedAt(userId, deletedAt) {
       this.searchResult.find((obj) => obj.userId === userId).deletedAt = deletedAt
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index dd61e8657..79e381478 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -13,7 +13,7 @@ const addNavigationGuards = (router, store, apollo, i18n) => {
         })
         .then((result) => {
           const moderator = result.data.verifyLogin
-          if (moderator.isAdmin) {
+          if (moderator.roles?.length) {
             i18n.locale = moderator.language
             store.commit('moderator', moderator)
             next({ path: '/' })
@@ -35,7 +35,7 @@ const addNavigationGuards = (router, store, apollo, i18n) => {
       !CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes
       (!store.state.token || // we do not have a token
         !store.state.moderator || // no moderator set in store
-        !store.state.moderator.isAdmin) && // user is no admin
+        !store.state.moderator.roles.length) && // user is no admin
       to.path !== '/not-found' && // we are not on `not-found`
       to.path !== '/logout' // we are not on `logout`
     ) {
diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js
index da4dd5969..6d51fda6d 100644
--- a/admin/src/router/guards.test.js
+++ b/admin/src/router/guards.test.js
@@ -5,7 +5,7 @@ const storeCommitMock = jest.fn()
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     verifyLogin: {
-      isAdmin: true,
+      roles: ['ADMIN'],
       language: 'de',
     },
   },
@@ -52,7 +52,10 @@ describe('navigation guards', () => {
       })
 
       it('commits the moderator to the store', () => {
-        expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true, language: 'de' })
+        expect(storeCommitMock).toBeCalledWith('moderator', {
+          roles: ['ADMIN'],
+          language: 'de',
+        })
       })
 
       it('redirects to /', () => {
@@ -60,12 +63,48 @@ describe('navigation guards', () => {
       })
     })
 
-    describe('with valid token and not as admin', () => {
-      beforeEach(() => {
+    describe('with valid token and as moderator', () => {
+      beforeEach(async () => {
+        jest.clearAllMocks()
         apolloQueryMock.mockResolvedValue({
           data: {
             verifyLogin: {
-              isAdmin: false,
+              roles: ['MODERATOR'],
+              language: 'de',
+            },
+          },
+        })
+        await navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+      })
+
+      it('commits the token to the store', () => {
+        expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
+      })
+
+      it.skip('sets the locale', () => {
+        expect(i18nLocaleMock).toBeCalledWith('de')
+      })
+
+      it('commits the moderator to the store', () => {
+        expect(storeCommitMock).toBeCalledWith('moderator', {
+          roles: ['MODERATOR'],
+          language: 'de',
+        })
+      })
+
+      it('redirects to /', () => {
+        expect(next).toBeCalledWith({ path: '/' })
+      })
+    })
+
+    describe('with valid token and no roles', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            verifyLogin: {
+              roles: [],
+              language: 'de',
             },
           },
         })
@@ -77,7 +116,7 @@ describe('navigation guards', () => {
       })
 
       it('does not commit the moderator to the store', () => {
-        expect(storeCommitMock).not.toBeCalledWith('moderator', { isAdmin: false })
+        expect(storeCommitMock).not.toBeCalledWith('moderator')
       })
 
       it('redirects to /not-found', async () => {
@@ -128,15 +167,22 @@ describe('navigation guards', () => {
       expect(next).toBeCalledWith({ path: '/not-found' })
     })
 
-    it('redirects to not found with token in store and not moderator', () => {
+    it('redirects to not found with token in store and not admin or moderator', () => {
       store.state.token = 'valid token'
       navGuard({ path: '/' }, {}, next)
       expect(next).toBeCalledWith({ path: '/not-found' })
     })
 
+    it('does not redirect with token in store and as admin', () => {
+      store.state.token = 'valid token'
+      store.state.moderator = { roles: ['ADMIN'] }
+      navGuard({ path: '/' }, {}, next)
+      expect(next).toBeCalledWith()
+    })
+
     it('does not redirect with token in store and as moderator', () => {
       store.state.token = 'valid token'
-      store.state.moderator = { isAdmin: true }
+      store.state.moderator = { roles: ['MODERATOR'] }
       navGuard({ path: '/' }, {}, next)
       expect(next).toBeCalledWith()
     })
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 7b64b548e..6408b9dda 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -655,9 +655,7 @@ export class UserResolver {
     const clientTimezoneOffset = getClientTimezoneOffset(context)
     const userFields = ['id', 'firstName', 'lastName', 'emailId', 'emailContact', 'deletedAt']
     const [users, count] = await findUsers(
-      userFields.map((fieldName) => {
-        return 'user.' + fieldName
-      }),
+      userFields,
       query,
       filters ?? null,
       currentPage,
diff --git a/backend/src/graphql/resolver/util/findUsers.ts b/backend/src/graphql/resolver/util/findUsers.ts
index d01afb904..a7d7d719c 100644
--- a/backend/src/graphql/resolver/util/findUsers.ts
+++ b/backend/src/graphql/resolver/util/findUsers.ts
@@ -1,10 +1,24 @@
-import { getConnection, Brackets, IsNull, Not } from '@dbTools/typeorm'
+import { IsNull, Not, Like } from '@dbTools/typeorm'
 import { User as DbUser } from '@entity/User'
 
 import { SearchUsersFilters } from '@arg/SearchUsersFilters'
 import { Order } from '@enum/Order'
 
-import { LogError } from '@/server/LogError'
+function likeQuery(searchCriteria: string) {
+  return Like(`%${searchCriteria}%`)
+}
+
+function emailCheckedQuery(filters: SearchUsersFilters) {
+  return filters.byActivated ?? undefined
+}
+
+function deletedAtQuery(filters: SearchUsersFilters | null) {
+  return filters?.byDeleted !== undefined && filters?.byDeleted !== null
+    ? filters.byDeleted
+      ? Not(IsNull())
+      : IsNull()
+    : undefined
+}
 
 export const findUsers = async (
   select: string[],
@@ -14,44 +28,51 @@ export const findUsers = async (
   pageSize: number,
   order = Order.ASC,
 ): Promise<[DbUser[], number]> => {
-  const queryRunner = getConnection().createQueryRunner()
-  try {
-    await queryRunner.connect()
-    const query = queryRunner.manager
-      .createQueryBuilder(DbUser, 'user')
-      .select(select)
-      .withDeleted()
-      .leftJoinAndSelect('user.emailContact', 'emailContact')
-      .where(
-        new Brackets((qb) => {
-          qb.where(
-            'user.firstName like :name or user.lastName like :lastName or emailContact.email like :email',
-            {
-              name: `%${searchCriteria}%`,
-              lastName: `%${searchCriteria}%`,
-              email: `%${searchCriteria}%`,
-            },
-          )
-        }),
-      )
-    if (filters) {
-      if (filters.byActivated !== null) {
-        query.andWhere('emailContact.emailChecked = :value', { value: filters.byActivated })
-      }
-
-      if (filters.byDeleted !== null) {
-        query.andWhere({ deletedAt: filters.byDeleted ? Not(IsNull()) : IsNull() })
-      }
-    }
-
-    return await query
-      .orderBy({ 'user.id': order })
-      .take(pageSize)
-      .skip((currentPage - 1) * pageSize)
-      .getManyAndCount()
-  } catch (err) {
-    throw new LogError('Unable to search users', err)
-  } finally {
-    await queryRunner.release()
+  const where = [
+    {
+      firstName: likeQuery(searchCriteria),
+      deletedAt: deletedAtQuery(filters),
+      emailContact: filters
+        ? {
+            emailChecked: emailCheckedQuery(filters),
+          }
+        : undefined,
+    },
+    {
+      lastName: likeQuery(searchCriteria),
+      deletedAt: deletedAtQuery(filters),
+      emailContact: filters
+        ? {
+            emailChecked: emailCheckedQuery(filters),
+          }
+        : undefined,
+    },
+    {
+      emailContact: {
+        // ...(filters ?? emailChecked: filters.byActivated)
+        emailChecked: filters ? emailCheckedQuery(filters) : undefined,
+        email: likeQuery(searchCriteria),
+      },
+      deletedAt: deletedAtQuery(filters),
+    },
+  ]
+  const selectFind = Object.fromEntries(select.map((item) => [item, true]))
+  const relations = ['emailContact', 'userRoles']
+  const orderFind = {
+    id: order,
   }
+  const take = pageSize
+  const skip = (currentPage - 1) * pageSize
+  const withDeleted = true
+
+  const [users, count] = await DbUser.findAndCount({
+    where,
+    withDeleted,
+    select: selectFind,
+    relations,
+    order: orderFind,
+    take,
+    skip,
+  })
+  return [users, count]
 }
diff --git a/database/migrations/0069-add_user_roles_table.ts b/database/migrations/0069-add_user_roles_table.ts
index 8b2970d39..1e774d05f 100644
--- a/database/migrations/0069-add_user_roles_table.ts
+++ b/database/migrations/0069-add_user_roles_table.ts
@@ -16,7 +16,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
   await queryFn(`
     INSERT INTO user_roles
       (user_id, role, created_at, updated_at)
-      SELECT u.id, 'admin', u.is_admin, null
+      SELECT u.id, 'ADMIN', u.is_admin, null
       FROM users u
       WHERE u.is_admin IS NOT NULL;`)
 
@@ -31,7 +31,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
   )
   // reconstruct the previous is_admin back from user_roles to users table
   const roles = await queryFn(
-    `SELECT r.user_id, r.role, r.created_at FROM user_roles as r WHERE r.role = "admin"`,
+    `SELECT r.user_id, r.role, r.created_at FROM user_roles as r WHERE r.role = "ADMIN"`,
   )
   for (const id in roles) {
     const role = roles[id]
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 73eea1015..1b18acc17 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -49,7 +49,7 @@
           </b-nav-item>
           <b-nav-item
             class="mb-3 text-light"
-            v-if="$store.state.roles.length > 0"
+            v-if="$store.state.roles && $store.state.roles.length > 0"
             @click="$emit('admin')"
             active-class="activeRoute"
           >