diff --git a/src/components/lists/EditList.vue b/src/components/lists/EditList.vue
index 3555e9b30..a0ea63570 100644
--- a/src/components/lists/EditList.vue
+++ b/src/components/lists/EditList.vue
@@ -1,44 +1,117 @@
 <template>
-	<div class="card">
-		<header class="card-header">
-			<p class="card-header-title">
-				Edit List
-			</p>
-		</header>
-		<div class="card-content">
-			<div class="content">
-				<form  @submit.prevent="submit()">
-					<div class="field">
-						<label class="label" for="listtext">List Name</label>
-						<div class="control">
-							<input :class="{ 'disabled': loading}" :disabled="loading" class="input" type="text" id="listtext" placeholder="The list title goes here..." v-model="list.title">
+	<div>
+		<div class="card">
+			<header class="card-header">
+				<p class="card-header-title">
+					Edit List
+				</p>
+			</header>
+			<div class="card-content">
+				<div class="content">
+					<form  @submit.prevent="submit()">
+						<div class="field">
+							<label class="label" for="listtext">List Name</label>
+							<div class="control">
+								<input :class="{ 'disabled': loading}" :disabled="loading" class="input" type="text" id="listtext" placeholder="The list title goes here..." v-model="list.title">
+							</div>
 						</div>
-					</div>
-					<div class="field">
-						<label class="label" for="listdescription">Description</label>
-						<div class="control">
-							<textarea :class="{ 'disabled': loading}" :disabled="loading" class="textarea" placeholder="The lists description goes here..." id="listdescription" v-model="list.description"></textarea>
+						<div class="field">
+							<label class="label" for="listdescription">Description</label>
+							<div class="control">
+								<textarea :class="{ 'disabled': loading}" :disabled="loading" class="textarea" placeholder="The lists description goes here..." id="listdescription" v-model="list.description"></textarea>
+							</div>
 						</div>
-					</div>
-				</form>
+					</form>
 
-				<div class="columns bigbuttons">
-					<div class="column">
-						<button @click="submit()" class="button is-success is-fullwidth" :class="{ 'is-loading': loading}">
-							Save
-						</button>
-					</div>
-					<div class="column is-1">
-						<button @click="showDeleteModal = true" class="button is-danger is-fullwidth" :class="{ 'is-loading': loading}">
-							<span class="icon is-small">
-								<icon icon="trash-alt"/>
-							</span>
-						</button>
+					<div class="columns bigbuttons">
+						<div class="column">
+							<button @click="submit()" class="button is-success is-fullwidth" :class="{ 'is-loading': loading}">
+								Save
+							</button>
+						</div>
+						<div class="column is-1">
+							<button @click="showDeleteModal = true" class="button is-danger is-fullwidth" :class="{ 'is-loading': loading}">
+								<span class="icon is-small">
+									<icon icon="trash-alt"/>
+								</span>
+							</button>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 
+		<div class="card">
+
+			<header class="card-header">
+				<p class="card-header-title">
+					Users with access to this list
+				</p>
+			</header>
+			<div class="card-content content users-list">
+				<form @submit.prevent="addUser()" class="add-user-form" v-if="userIsAdmin">
+					<div class="field is-grouped">
+						<p class="control has-icons-left is-expanded" v-bind:class="{ 'is-loading': loading}">
+							<input class="input" v-bind:class="{ 'disabled': loading}" v-model.number="newUser.user_id" type="text" placeholder="Add a new user...">
+							<span class="icon is-small is-left">
+								<icon icon="user"/>
+							</span>
+						</p>
+						<p class="control">
+							<button type="submit" class="button is-success">
+								<span class="icon is-small">
+									<icon icon="plus"/>
+								</span>
+								Add
+							</button>
+						</p>
+					</div>
+				</form>
+				<table class="table is-striped is-hoverable is-fullwidth">
+					<tbody>
+					<tr v-for="u in listUsers" :key="u.id">
+						<td>{{u.username}}</td>
+						<td>
+							<template v-if="u.id === user.infos.id">
+								<b class="is-success">You</b>
+							</template>
+						</td>
+						<td class="type">
+							<template v-if="u.admin">
+									<span class="icon is-small">
+										<icon icon="lock"/>
+									</span>
+								Admin
+							</template>
+							<template v-else>
+									<span class="icon is-small">
+										<icon icon="user"/>
+									</span>
+								Member
+							</template>
+						</td>
+						<td class="actions" v-if="userIsAdmin">
+							<button @click="toggleUserType(u.id, u.admin)" class="button buttonright is-primary" v-if="u.id !== user.infos.id">
+								Make
+								<template v-if="!u.admin">
+									Admin
+								</template>
+								<template v-else>
+									Member
+								</template>
+							</button>
+							<button @click="userToDelete = u.id; showUserDeleteModal = true" class="button is-danger" v-if="u.id !== user.infos.id">
+									<span class="icon is-small">
+										<icon icon="trash-alt"/>
+									</span>
+							</button>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
 		<modal
 				v-if="showDeleteModal"
 				@close="showDeleteModal = false"
@@ -64,6 +137,10 @@
                 error: '',
                 loading: false,
                 showDeleteModal: false,
+				listUsers: [],
+				user: auth.user,
+				userIsAdmin: false,
+				newUser: {user_id: 0}
             }
         },
         beforeMount() {
@@ -86,12 +163,28 @@
                 HTTP.get(`lists/` + this.$route.params.id, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
                     .then(response => {
                         this.$set(this, 'list', response.data)
+						if (response.data.owner.id === this.user.infos.id) {
+							this.userIsAdmin = true
+						}
+						this.loadUsers()
                         this.loading = false
                     })
                     .catch(e => {
                         this.handleError(e)
                     })
             },
+			loadUsers() {
+				// Get all users with access to the list
+				HTTP.get(`lists/` + this.$route.params.id + `/users`, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
+					.then(response => {
+						response.data.push(this.list.owner)
+						this.$set(this, 'listUsers', response.data)
+						this.loading = false
+					})
+					.catch(e => {
+						this.handleError(e)
+					})
+			},
             submit() {
                 this.loading = true
 
@@ -122,6 +215,24 @@
                         this.handleError(e)
                     })
             },
+			addUser(admin) {
+				if(admin === null) {
+					admin = false
+				}
+				this.newUser.right = 0
+				if (admin) {
+					this.newUser.right = 2
+				}
+
+				HTTP.put(`lists/` + this.$route.params.id + `/users`, this.newUser, {headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}})
+					.then(() => {
+						this.loadUsers()
+						this.handleSuccess({message: 'The user was successfully added.'})
+					})
+					.catch(e => {
+						this.handleError(e)
+					})
+			},
             handleError(e) {
                 this.loading = false
                 message.error(e, this)
@@ -134,8 +245,36 @@
     }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.bigbuttons{
 		margin-top: 0.5rem;
 	}
+
+	.card{
+		margin-bottom: 1rem;
+
+		.add-user-form {
+			margin: 1rem;
+		}
+
+		.table{
+			border-top: 1px solid darken(#fff, 15%);
+
+			td{
+				vertical-align: middle;
+			}
+
+			td.type, td.actions{
+				width: 200px;
+			}
+
+			td.actions{
+				text-align: right;
+			}
+		}
+	}
+
+	.users-list{
+		padding: 0;
+	}
 </style>
\ No newline at end of file