diff --git a/src/services/teamMember.js b/src/services/teamMember.js
index 99adc9262..01cb0a39f 100644
--- a/src/services/teamMember.js
+++ b/src/services/teamMember.js
@@ -7,7 +7,8 @@ export default class TeamMemberService extends AbstractService {
 		super({
 			create: '/teams/{teamId}/members',
 			delete: '/teams/{teamId}/members/{username}',
-		});
+			update: '/teams/{teamId}/members/{username}/admin',
+		})
 	}
 
 	processModel(model) {
@@ -19,7 +20,7 @@ export default class TeamMemberService extends AbstractService {
 	modelFactory(data) {
 		return new TeamMemberModel(data)
 	}
-	
+
 	beforeCreate(model) {
 		model.userId = model.id // The api wants to get the user id as user_Id
 		model.admin = model.admin === null ? false : model.admin
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 37b23da99..35ca29aca 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -129,6 +129,7 @@
 						</td>
 						<td class="actions" v-if="userIsAdmin">
 							<button @click="toggleUserType(m)" class="button buttonright is-primary"
+									:class="{'is-loading': teamMemberService.loading}"
 									v-if="m.id !== userInfo.id">
 								Make
 								<template v-if="!m.admin">
@@ -139,6 +140,7 @@
 								</template>
 							</button>
 							<button @click="() => {member = m; showUserDeleteModal = true}" class="button is-danger"
+									:class="{'is-loading': teamMemberService.loading}"
 									v-if="m.id !== userInfo.id">
 									<span class="icon is-small">
 										<icon icon="trash-alt"/>
@@ -230,7 +232,7 @@
 		},
 		watch: {
 			// call again the method if the route changes
-			'$route': 'loadTeam'
+			'$route': 'loadTeam',
 		},
 		computed: mapState({
 			userInfo: state => state.auth.info,
@@ -309,11 +311,15 @@
 			},
 			toggleUserType(member) {
 				member.admin = !member.admin
-				this.teamMemberService.delete(member)
-					.then(() => this.teamMemberService.create(member))
-					.then(() => {
-						this.loadTeam()
-						this.success({message: 'The team member was successfully made ' + (member.admin ? 'admin': 'member') + '.'}, this)
+				this.teamMemberService.update(member)
+					.then(r => {
+						for(const tm in this.team.members) {
+							if (this.team.members[tm].id === member.id) {
+								this.$set(this.team.members[tm], 'admin', r.admin)
+								break
+							}
+						}
+						this.success({message: 'The team member was successfully made ' + (member.admin ? 'admin' : 'member') + '.'}, this)
 					})
 					.catch(e => {
 						this.error(e, this)
@@ -336,7 +342,7 @@
 			clearAll() {
 				this.$set(this, 'foundUsers', [])
 			},
-		}
+		},
 	}
 </script>