diff --git a/webapp/graphql/admin/Roles.js b/webapp/graphql/admin/Roles.js
index 4542708f3..22e0b8fff 100644
--- a/webapp/graphql/admin/Roles.js
+++ b/webapp/graphql/admin/Roles.js
@@ -13,13 +13,14 @@ export const FetchAllRoles = gql`
 
 export const updateUserRole = (role, id) => {
   return gql`
-        mutation {
-            switchUserRole(role: ${role}, id: "${id}" ) {
-                name
-                role
-                id
-                updatedAt
-                email
-            }
-        }`
+    mutation($role: UserGroup!, $id: ID!) {
+      switchUserRole(role: $role, id: $id) {
+        name
+        role
+        id
+        updatedAt
+        email
+      }
+    }
+  `
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 4d34757d8..9ef86a7d4 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -63,6 +63,7 @@
         "placeholder": "E-Mail, Name oder Beschreibung"
       },
       "name": "Benutzer",
+      "roleChanged": "Rolle erfolgreich geändert!",
       "table": {
         "columns": {
           "createdAt": "Erstellt am",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index afb767c14..3c2af7556 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -63,6 +63,7 @@
         "placeholder": "e-mail, name or description"
       },
       "name": "Users",
+      "roleChanged": "Role changed successfully!",
       "table": {
         "columns": {
           "createdAt": "Created at",
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 5cd025a97..17562cf7f 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -49,11 +49,12 @@
           {{ scope.row.createdAt | dateTime }}
         </template>
 
-        <template slot="role" slot-scope="scope" v-if="scope.row.email != currentUser.email">
+        <template slot="role" slot-scope="scope">
           <ApolloQuery :query="FetchAllRoles">
             <template v-slot="{ result: { data } }">
               <template v-if="data">
                 <select
+                  v-if="scope.row.id !== currentUser.id"
                   :value="`${scope.row.role}`"
                   v-on:change="changeUserRole(scope.row.id, $event)"
                 >
@@ -61,6 +62,7 @@
                     {{ value.name }}
                   </option>
                 </select>
+                <ds-text v-else>{{ scope.row.role }}</ds-text>
               </template>
             </template>
           </ApolloQuery>
@@ -204,6 +206,9 @@ export default {
           mutation: updateUserRole(newRole, id),
           variables: { role: newRole, id },
         })
+        .then(({ data }) => {
+          this.$toast.success(this.$t('admin.users.roleChanged'))
+        })
         .catch((error) => {
           this.$toast.error(error.message)
         })