diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index 3c3b25af38d7d..47a035016add0 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -1435,7 +1435,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 			&#grid-header {
 				color: var(--color-text-maxcontrast);
 				z-index: 60; /* above new-user */
-				border-bottom-width: medium;
+				border-bottom-width: thin;
 
 				#headerDisplayName,
 				#headerPassword,
@@ -1511,7 +1511,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 					align-items: center;
 					justify-content: center;
 					progress {
-						width: 100%; 
+						width: 100%;
 						margin: 0 10px;
 						height: 3px;
 					}
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index 48564f000a2ce..583d6d6958102 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -21,209 +21,211 @@
   -->
 
 <template>
-	<div id="app-content" class="user-list-grid" @scroll.passive="onScroll">
-		<div id="grid-header" class="row" :class="{'sticky': scrolled && !showConfig.showNewUserForm}">
-			<div id="headerAvatar" class="avatar" />
-			<div id="headerName" class="name">
+	<div @scroll.passive="onScroll" class="user-list-grid" id="app-content">
+		<div :class="{'sticky': scrolled && !showConfig.showNewUserForm}" class="row"
+			 id="grid-header">
+			<div class="avatar" id="headerAvatar"/>
+			<div class="name" id="headerName">
 				{{ t('settings', 'Username') }}
 
 				<div class="subtitle">
 					{{ t('settings', 'Display name') }}
 				</div>
 			</div>
-			<div id="headerPassword" class="password">
+			<div class="password" id="headerPassword">
 				{{ t('settings', 'Password') }}
 			</div>
-			<div id="headerAddress" class="mailAddress">
+			<div class="mailAddress" id="headerAddress">
 				{{ t('settings', 'Email') }}
 			</div>
-			<div id="headerGroups" class="groups">
+			<div class="groups" id="headerGroups">
 				{{ t('settings', 'Groups') }}
 			</div>
-			<div v-if="subAdminsGroups.length>0 && settings.isAdmin"
-				id="headerSubAdmins"
-				class="subadmins">
+			<div class="subadmins"
+				 id="headerSubAdmins"
+				 v-if="subAdminsGroups.length>0 && settings.isAdmin">
 				{{ t('settings', 'Group admin for') }}
 			</div>
-			<div id="headerQuota" class="quota">
+			<div class="quota" id="headerQuota">
 				{{ t('settings', 'Quota') }}
 			</div>
-			<div v-if="showConfig.showLanguages"
-				id="headerLanguages"
-				class="languages">
+			<div class="languages"
+				 id="headerLanguages"
+				 v-if="showConfig.showLanguages">
 				{{ t('settings', 'Language') }}
 			</div>
 
-			<div v-if="showConfig.showUserBackend || showConfig.showStoragePath"
-				class="headerUserBackend userBackend">
-				<div v-if="showConfig.showUserBackend" class="userBackend">
+			<div class="headerUserBackend userBackend"
+				 v-if="showConfig.showUserBackend || showConfig.showStoragePath">
+				<div class="userBackend" v-if="showConfig.showUserBackend">
 					{{ t('settings', 'User backend') }}
 				</div>
-				<div v-if="showConfig.showStoragePath"
-					class="subtitle storageLocation">
+				<div class="subtitle storageLocation"
+					 v-if="showConfig.showStoragePath">
 					{{ t('settings', 'Storage location') }}
 				</div>
 			</div>
-			<div v-if="showConfig.showLastLogin"
-				class="headerLastLogin lastLogin">
+			<div class="headerLastLogin lastLogin"
+				 v-if="showConfig.showLastLogin">
 				{{ t('settings', 'Last login') }}
 			</div>
 
-			<div class="userActions" />
+			<div class="userActions"/>
 		</div>
 
-		<form v-show="showConfig.showNewUserForm"
-			id="new-user"
-			class="row"
-			:disabled="loading.all"
-			:class="{'sticky': scrolled && showConfig.showNewUserForm}"
-			@submit.prevent="createUser">
-			<div :class="loading.all?'icon-loading-small':'icon-add'" />
+		<form :class="{'sticky': scrolled && showConfig.showNewUserForm}"
+			  :disabled="loading.all"
+			  @submit.prevent="createUser"
+			  class="row"
+			  id="new-user"
+			  v-show="showConfig.showNewUserForm">
+			<div :class="loading.all?'icon-loading-small':'icon-add'"/>
 			<div class="name">
-				<input id="newusername"
-					ref="newusername"
-					v-model="newUser.id"
-					type="text"
-					required
-					:placeholder="settings.newUserGenerateUserID
+				<input :disabled="settings.newUserGenerateUserID"
+					   :placeholder="settings.newUserGenerateUserID
 						? t('settings', 'Will be autogenerated')
 						: t('settings', 'Username')"
-					name="username"
-					autocomplete="off"
-					autocapitalize="none"
-					autocorrect="off"
-					pattern="[a-zA-Z0-9 _\.@\-']+"
-					:disabled="settings.newUserGenerateUserID">
+					   autocapitalize="none"
+					   autocomplete="off"
+					   autocorrect="off"
+					   id="newusername"
+					   name="username"
+					   pattern="[a-zA-Z0-9 _\.@\-']+"
+					   ref="newusername"
+					   required
+					   type="text"
+					   v-model="newUser.id">
 			</div>
 			<div class="displayName">
-				<input id="newdisplayname"
-					v-model="newUser.displayName"
-					type="text"
-					:placeholder="t('settings', 'Display name')"
-					name="displayname"
-					autocomplete="off"
-					autocapitalize="none"
-					autocorrect="off">
+				<input :placeholder="t('settings', 'Display name')"
+					   autocapitalize="none"
+					   autocomplete="off"
+					   autocorrect="off"
+					   id="newdisplayname"
+					   name="displayname"
+					   type="text"
+					   v-model="newUser.displayName">
 			</div>
 			<div class="password">
-				<input id="newuserpassword"
-					ref="newuserpassword"
-					v-model="newUser.password"
-					type="password"
-					:required="newUser.mailAddress===''"
-					:placeholder="t('settings', 'Password')"
-					name="password"
-					autocomplete="new-password"
-					autocapitalize="none"
-					autocorrect="off"
-					:minlength="minPasswordLength">
+				<input :minlength="minPasswordLength"
+					   :placeholder="t('settings', 'Password')"
+					   :required="newUser.mailAddress===''"
+					   autocapitalize="none"
+					   autocomplete="new-password"
+					   autocorrect="off"
+					   id="newuserpassword"
+					   name="password"
+					   ref="newuserpassword"
+					   type="password"
+					   v-model="newUser.password">
 			</div>
 			<div class="mailAddress">
-				<input id="newemail"
-					v-model="newUser.mailAddress"
-					type="email"
-					:required="newUser.password==='' || settings.newUserRequireEmail"
-					:placeholder="t('settings', 'Email')"
-					name="email"
-					autocomplete="off"
-					autocapitalize="none"
-					autocorrect="off">
+				<input :placeholder="t('settings', 'Email')"
+					   :required="newUser.password==='' || settings.newUserRequireEmail"
+					   autocapitalize="none"
+					   autocomplete="off"
+					   autocorrect="off"
+					   id="newemail"
+					   name="email"
+					   type="email"
+					   v-model="newUser.mailAddress">
 			</div>
 			<div class="groups">
 				<!-- hidden input trick for vanilla html5 form validation -->
-				<input v-if="!settings.isAdmin"
-					id="newgroups"
-					type="text"
-					:value="newUser.groups"
-					tabindex="-1"
-					:required="!settings.isAdmin"
-					:class="{'icon-loading-small': loading.groups}">
-				<Multiselect v-model="newUser.groups"
-					:options="canAddGroups"
-					:disabled="loading.groups||loading.all"
-					tag-placeholder="create"
-					:placeholder="t('settings', 'Add user in group')"
-					label="name"
-					track-by="id"
-					class="multiselect-vue"
-					:multiple="true"
-					:taggable="true"
-					:close-on-select="false"
-					:tag-width="60"
-					@tag="createGroup">
+				<input :class="{'icon-loading-small': loading.groups}"
+					   :required="!settings.isAdmin"
+					   :value="newUser.groups"
+					   id="newgroups"
+					   tabindex="-1"
+					   type="text"
+					   v-if="!settings.isAdmin">
+				<Multiselect :close-on-select="false"
+							 :disabled="loading.groups||loading.all"
+							 :multiple="true"
+							 :options="canAddGroups"
+							 :placeholder="t('settings', 'Add user in group')"
+							 :tag-width="60"
+							 :taggable="true"
+							 @tag="createGroup"
+							 class="multiselect-vue"
+							 label="name"
+							 tag-placeholder="create"
+							 track-by="id"
+							 v-model="newUser.groups">
 					<!-- If user is not admin, he is a subadmin.
 						Subadmins can't create users outside their groups
 						Therefore, empty select is forbidden -->
 					<span slot="noResult">{{ t('settings', 'No results') }}</span>
 				</Multiselect>
 			</div>
-			<div v-if="subAdminsGroups.length>0 && settings.isAdmin" class="subadmins">
-				<Multiselect v-model="newUser.subAdminsGroups"
-					:options="subAdminsGroups"
-					:placeholder="t('settings', 'Set user as admin for')"
-					label="name"
-					track-by="id"
-					class="multiselect-vue"
-					:multiple="true"
-					:close-on-select="false"
-					:tag-width="60">
+			<div class="subadmins"
+				 v-if="subAdminsGroups.length>0 && settings.isAdmin">
+				<Multiselect :close-on-select="false"
+							 :multiple="true"
+							 :options="subAdminsGroups"
+							 :placeholder="t('settings', 'Set user as admin for')"
+							 :tag-width="60"
+							 class="multiselect-vue"
+							 label="name"
+							 track-by="id"
+							 v-model="newUser.subAdminsGroups">
 					<span slot="noResult">{{ t('settings', 'No results') }}</span>
 				</Multiselect>
 			</div>
 			<div class="quota">
-				<Multiselect v-model="newUser.quota"
-					:options="quotaOptions"
-					:placeholder="t('settings', 'Select user quota')"
-					label="label"
-					track-by="id"
-					class="multiselect-vue"
-					:allow-empty="false"
-					:taggable="true"
-					@tag="validateQuota" />
+				<Multiselect :allow-empty="false"
+							 :options="quotaOptions"
+							 :placeholder="t('settings', 'Select user quota')"
+							 :taggable="true"
+							 @tag="validateQuota"
+							 class="multiselect-vue"
+							 label="label"
+							 track-by="id"
+							 v-model="newUser.quota"/>
 			</div>
-			<div v-if="showConfig.showLanguages" class="languages">
-				<Multiselect v-model="newUser.language"
-					:options="languages"
-					:placeholder="t('settings', 'Default language')"
-					label="name"
-					track-by="code"
-					class="multiselect-vue"
-					:allow-empty="false"
-					group-values="languages"
-					group-label="label" />
+			<div class="languages" v-if="showConfig.showLanguages">
+				<Multiselect :allow-empty="false"
+							 :options="languages"
+							 :placeholder="t('settings', 'Default language')"
+							 class="multiselect-vue"
+							 group-label="label"
+							 group-values="languages"
+							 label="name"
+							 track-by="code"
+							 v-model="newUser.language"/>
 			</div>
-			<div v-if="showConfig.showStoragePath" class="storageLocation" />
-			<div v-if="showConfig.showUserBackend" class="userBackend" />
-			<div v-if="showConfig.showLastLogin" class="lastLogin" />
+			<div class="storageLocation" v-if="showConfig.showStoragePath"/>
+			<div class="userBackend" v-if="showConfig.showUserBackend"/>
+			<div class="lastLogin" v-if="showConfig.showLastLogin"/>
 			<div class="userActions">
-				<input id="newsubmit"
-					type="submit"
-					class="button primary icon-checkmark-white has-tooltip"
-					value=""
-					:title="t('settings', 'Add a new user')">
+				<input :title="t('settings', 'Add a new user')"
+					   class="button primary icon-checkmark-white has-tooltip"
+					   id="newsubmit"
+					   type="submit"
+					   value="">
 			</div>
 		</form>
 
-		<user-row v-for="(user, key) in filteredUsers"
-			:key="key"
-			:user="user"
-			:settings="settings"
-			:show-config="showConfig"
-			:groups="groups"
-			:sub-admins-groups="subAdminsGroups"
-			:quota-options="quotaOptions"
-			:languages="languages"
-			:external-actions="externalActions" />
-		<InfiniteLoading ref="infiniteLoading" @infinite="infiniteHandler">
+		<user-row :external-actions="externalActions"
+				  :groups="groups"
+				  :key="key"
+				  :languages="languages"
+				  :quota-options="quotaOptions"
+				  :settings="settings"
+				  :show-config="showConfig"
+				  :sub-admins-groups="subAdminsGroups"
+				  :user="user"
+				  v-for="(user, key) in filteredUsers"/>
+		<InfiniteLoading @infinite="infiniteHandler" ref="infiniteLoading">
 			<div slot="spinner">
-				<div class="users-icon-loading icon-loading" />
+				<div class="users-icon-loading icon-loading"/>
 			</div>
 			<div slot="no-more">
-				<div class="users-list-end" />
+				<div class="users-list-end"/>
 			</div>
 			<div slot="no-results">
 				<div id="emptycontent">
-					<div class="icon-contacts-dark" />
+					<div class="icon-contacts-dark"/>
 					<h2>{{ t('settings', 'No users in here') }}</h2>
 				</div>
 			</div>
@@ -232,327 +234,332 @@
 </template>
 
 <script>
-import userRow from './UserList/UserRow'
-import { Multiselect } from 'nextcloud-vue'
-import InfiniteLoading from 'vue-infinite-loading'
-import Vue from 'vue'
+	import userRow from './UserList/UserRow'
+	import { Multiselect } from 'nextcloud-vue'
+	import InfiniteLoading from 'vue-infinite-loading'
+	import Vue from 'vue'
 
-const unlimitedQuota = {
-	id: 'none',
-	label: t('settings', 'Unlimited')
-}
-const defaultQuota = {
-	id: 'default',
-	label: t('settings', 'Default quota')
-}
-const newUser = {
-	id: '',
-	displayName: '',
-	password: '',
-	mailAddress: '',
-	groups: [],
-	subAdminsGroups: [],
-	quota: defaultQuota,
-	language: {
-		code: 'en',
-		name: t('settings', 'Default language')
+	const unlimitedQuota = {
+		id: 'none',
+		label: t('settings', 'Unlimited')
+	}
+	const defaultQuota = {
+		id: 'default',
+		label: t('settings', 'Default quota')
+	}
+	const newUser = {
+		id: '',
+		displayName: '',
+		password: '',
+		mailAddress: '',
+		groups: [],
+		subAdminsGroups: [],
+		quota: defaultQuota,
+		language: {
+			code: 'en',
+			name: t('settings', 'Default language')
+		}
 	}
-}
 
-export default {
-	name: 'UserList',
-	components: {
-		userRow,
-		Multiselect,
-		InfiniteLoading
-	},
-	props: {
-		users: {
-			type: Array,
-			default: () => []
+	export default {
+		name: 'UserList',
+		components: {
+			userRow,
+			Multiselect,
+			InfiniteLoading
 		},
-		showConfig: {
-			type: Object,
-			required: true
-		},
-		selectedGroup: {
-			type: String,
-			default: null
-		},
-		externalActions: {
-			type: Array,
-			default: () => []
-		}
-	},
-	data() {
-		return {
-			unlimitedQuota,
-			defaultQuota,
-			loading: {
-				all: false,
-				groups: false
+		props: {
+			users: {
+				type: Array,
+				default: () => []
 			},
-			scrolled: false,
-			searchQuery: '',
-			newUser: Object.assign({}, newUser)
-		}
-	},
-	computed: {
-		settings() {
-			return this.$store.getters.getServerData
-		},
-		filteredUsers() {
-			if (this.selectedGroup === 'disabled') {
-				return this.users.filter(user => user.enabled === false)
-			}
-			if (!this.settings.isAdmin) {
-				// we don't want subadmins to edit themselves
-				return this.users.filter(user => user.enabled !== false && user.id !== OC.getCurrentUser().uid)
+			showConfig: {
+				type: Object,
+				required: true
+			},
+			selectedGroup: {
+				type: String,
+				default: null
+			},
+			externalActions: {
+				type: Array,
+				default: () => []
 			}
-			return this.users.filter(user => user.enabled !== false)
 		},
-		groups() {
-			// data provided php side + remove the disabled group
-			return this.$store.getters.getGroups
-				.filter(group => group.id !== 'disabled')
-				.sort((a, b) => a.name.localeCompare(b.name))
-		},
-		canAddGroups() {
-			// disabled if no permission to add new users to group
-			return this.groups.map(group => {
-				// clone object because we don't want
-				// to edit the original groups
-				group = Object.assign({}, group)
-				group.$isDisabled = group.canAdd === false
-				return group
-			})
-		},
-		subAdminsGroups() {
-			// data provided php side
-			return this.$store.getters.getSubadminGroups
-		},
-		quotaOptions() {
-			// convert the preset array into objects
-			let quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({ id: cur, label: cur }), [])
-			// add default presets
-			quotaPreset.unshift(this.unlimitedQuota)
-			quotaPreset.unshift(this.defaultQuota)
-			return quotaPreset
-		},
-		minPasswordLength() {
-			return this.$store.getters.getPasswordPolicyMinLength
-		},
-		usersOffset() {
-			return this.$store.getters.getUsersOffset
-		},
-		usersLimit() {
-			return this.$store.getters.getUsersLimit
+		data() {
+			return {
+				unlimitedQuota,
+				defaultQuota,
+				loading: {
+					all: false,
+					groups: false
+				},
+				scrolled: false,
+				searchQuery: '',
+				newUser: Object.assign({}, newUser)
+			}
 		},
-		usersCount() {
-			return this.users.length
+		computed: {
+			settings() {
+				return this.$store.getters.getServerData
+			},
+			filteredUsers() {
+				if (this.selectedGroup === 'disabled') {
+					return this.users.filter(user => user.enabled === false)
+				}
+				if (!this.settings.isAdmin) {
+					// we don't want subadmins to edit themselves
+					return this.users.filter(user => user.enabled !== false && user.id !== OC.getCurrentUser().uid)
+				}
+				return this.users.filter(user => user.enabled !== false)
+			},
+			groups() {
+				// data provided php side + remove the disabled group
+				return this.$store.getters.getGroups
+						.filter(group => group.id !== 'disabled')
+						.sort((a, b) => a.name.localeCompare(b.name))
+			},
+			canAddGroups() {
+				// disabled if no permission to add new users to group
+				return this.groups.map(group => {
+					// clone object because we don't want
+					// to edit the original groups
+					group = Object.assign({}, group)
+					group.$isDisabled = group.canAdd === false
+					return group
+				})
+			},
+			subAdminsGroups() {
+				// data provided php side
+				return this.$store.getters.getSubadminGroups
+			},
+			quotaOptions() {
+				// convert the preset array into objects
+				let quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({
+					id: cur,
+					label: cur
+				}), [])
+				// add default presets
+				quotaPreset.unshift(this.unlimitedQuota)
+				quotaPreset.unshift(this.defaultQuota)
+				return quotaPreset
+			},
+			minPasswordLength() {
+				return this.$store.getters.getPasswordPolicyMinLength
+			},
+			usersOffset() {
+				return this.$store.getters.getUsersOffset
+			},
+			usersLimit() {
+				return this.$store.getters.getUsersLimit
+			},
+			usersCount() {
+				return this.users.length
+			},
+
+			/* LANGUAGES */
+			languages() {
+				return [
+					{
+						label: t('settings', 'Common languages'),
+						languages: this.settings.languages.commonlanguages
+					},
+					{
+						label: t('settings', 'All languages'),
+						languages: this.settings.languages.languages
+					}
+				]
+			}
 		},
+		watch: {
+			// watch url change and group select
+			selectedGroup: function(val, old) {
+				// if selected is the disabled group but it's empty
+				this.redirectIfDisabled()
+				this.$store.commit('resetUsers')
+				this.$refs.infiniteLoading.stateChanger.reset()
+				this.setNewUserDefaultGroup(val)
+			},
 
-		/* LANGUAGES */
-		languages() {
-			return [
-				{
-					label: t('settings', 'Common languages'),
-					languages: this.settings.languages.commonlanguages
-				},
-				{
-					label: t('settings', 'All languages'),
-					languages: this.settings.languages.languages
+			// make sure the infiniteLoading state is changed if we manually
+			// add/remove data from the store
+			usersCount: function(val, old) {
+				// deleting the last user, reset the list
+				if (val === 0 && old === 1) {
+					this.$refs.infiniteLoading.stateChanger.reset()
+					// adding the first user, warn the infiniteLoader that
+					// the list is not empty anymore (we don't fetch the newly
+					// added user as we already have all the info we need)
+				} else if (val === 1 && old === 0) {
+					this.$refs.infiniteLoading.stateChanger.loaded()
 				}
-			]
-		}
-	},
-	watch: {
-		// watch url change and group select
-		selectedGroup: function(val, old) {
-			// if selected is the disabled group but it's empty
-			this.redirectIfDisabled()
-			this.$store.commit('resetUsers')
-			this.$refs.infiniteLoading.stateChanger.reset()
-			this.setNewUserDefaultGroup(val)
+			}
 		},
-
-		// make sure the infiniteLoading state is changed if we manually
-		// add/remove data from the store
-		usersCount: function(val, old) {
-			// deleting the last user, reset the list
-			if (val === 0 && old === 1) {
-				this.$refs.infiniteLoading.stateChanger.reset()
-				// adding the first user, warn the infiniteLoader that
-				// the list is not empty anymore (we don't fetch the newly
-				// added user as we already have all the info we need)
-			} else if (val === 1 && old === 0) {
-				this.$refs.infiniteLoading.stateChanger.loaded()
+		mounted() {
+			if (!this.settings.canChangePassword) {
+				OC.Notification.showTemporary(t('settings', 'Password change is disabled because the master key is disabled'))
 			}
-		}
-	},
-	mounted() {
-		if (!this.settings.canChangePassword) {
-			OC.Notification.showTemporary(t('settings', 'Password change is disabled because the master key is disabled'))
-		}
 
-		/**
+			/**
 			 * Reset and init new user form
 			 */
-		this.resetForm()
+			this.resetForm()
 
-		/**
+			/**
 			 * Register search
 			 */
-		this.userSearch = new OCA.Search(this.search, this.resetSearch)
+			this.userSearch = new OCA.Search(this.search, this.resetSearch)
 
-		/**
+			/**
 			 * If disabled group but empty, redirect
 			 */
-		this.redirectIfDisabled()
-	},
-	methods: {
-		onScroll(event) {
-			this.scrolled = event.target.scrollTo > 0
+			this.redirectIfDisabled()
 		},
+		methods: {
+			onScroll(event) {
+				this.scrolled = event.target.scrollTo > 0
+			},
 
-		/**
+			/**
 			 * Validate quota string to make sure it's a valid human file size
 			 *
 			 * @param {string} quota Quota in readable format '5 GB'
 			 * @returns {Object}
 			 */
-		validateQuota(quota) {
-			// only used for new presets sent through @Tag
-			let validQuota = OC.Util.computerFileSize(quota)
-			if (validQuota !== null && validQuota >= 0) {
-				// unify format output
-				quota = OC.Util.humanFileSize(OC.Util.computerFileSize(quota))
-				this.newUser.quota = { id: quota, label: quota }
-				return this.newUser.quota
-			}
-			// Default is unlimited
-			this.newUser.quota = this.quotaOptions[0]
-			return this.quotaOptions[0]
-		},
+			validateQuota(quota) {
+				// only used for new presets sent through @Tag
+				let validQuota = OC.Util.computerFileSize(quota)
+				if (validQuota !== null && validQuota >= 0) {
+					// unify format output
+					quota = OC.Util.humanFileSize(OC.Util.computerFileSize(quota))
+					this.newUser.quota = { id: quota, label: quota }
+					return this.newUser.quota
+				}
+				// Default is unlimited
+				this.newUser.quota = this.quotaOptions[0]
+				return this.quotaOptions[0]
+			},
 
-		infiniteHandler($state) {
-			this.$store.dispatch('getUsers', {
-				offset: this.usersOffset,
-				limit: this.usersLimit,
-				group: this.selectedGroup !== 'disabled' ? this.selectedGroup : '',
-				search: this.searchQuery
-			})
-				.then((response) => { response ? $state.loaded() : $state.complete() })
-		},
+			infiniteHandler($state) {
+				this.$store.dispatch('getUsers', {
+					offset: this.usersOffset,
+					limit: this.usersLimit,
+					group: this.selectedGroup !== 'disabled' ? this.selectedGroup : '',
+					search: this.searchQuery
+				})
+						.then((response) => {
+							response ? $state.loaded() : $state.complete()
+						})
+			},
 
-		/* SEARCH */
-		search(query) {
-			this.searchQuery = query
-			this.$store.commit('resetUsers')
-			this.$refs.infiniteLoading.stateChanger.reset()
-		},
-		resetSearch() {
-			this.search('')
-		},
+			/* SEARCH */
+			search(query) {
+				this.searchQuery = query
+				this.$store.commit('resetUsers')
+				this.$refs.infiniteLoading.stateChanger.reset()
+			},
+			resetSearch() {
+				this.search('')
+			},
 
-		resetForm() {
-			// revert form to original state
-			this.newUser = Object.assign({}, newUser)
+			resetForm() {
+				// revert form to original state
+				this.newUser = Object.assign({}, newUser)
 
-			/**
+				/**
 				 * Init default language from server data. The use of this.settings
 				 * requires a computed variable, which break the v-model binding of the form,
 				 * this is a much easier solution than getter and setter on a computed var
 				 */
-			if (this.settings.defaultLanguage) {
-				Vue.set(this.newUser.language, 'code', this.settings.defaultLanguage)
-			}
+				if (this.settings.defaultLanguage) {
+					Vue.set(this.newUser.language, 'code', this.settings.defaultLanguage)
+				}
 
-			/**
+				/**
 				 * In case the user directly loaded the user list within a group
 				 * the watch won't be triggered. We need to initialize it.
 				 */
-			this.setNewUserDefaultGroup(this.selectedGroup)
+				this.setNewUserDefaultGroup(this.selectedGroup)
 
-			this.loading.all = false
-		},
-		createUser() {
-			this.loading.all = true
-			this.$store.dispatch('addUser', {
-				userid: this.newUser.id,
-				password: this.newUser.password,
-				displayName: this.newUser.displayName,
-				email: this.newUser.mailAddress,
-				groups: this.newUser.groups.map(group => group.id),
-				subadmin: this.newUser.subAdminsGroups.map(group => group.id),
-				quota: this.newUser.quota.id,
-				language: this.newUser.language.code
-			})
-				.then(() => {
-					this.resetForm()
-					this.$refs.newusername.focus()
+				this.loading.all = false
+			},
+			createUser() {
+				this.loading.all = true
+				this.$store.dispatch('addUser', {
+					userid: this.newUser.id,
+					password: this.newUser.password,
+					displayName: this.newUser.displayName,
+					email: this.newUser.mailAddress,
+					groups: this.newUser.groups.map(group => group.id),
+					subadmin: this.newUser.subAdminsGroups.map(group => group.id),
+					quota: this.newUser.quota.id,
+					language: this.newUser.language.code
 				})
-				.catch((error) => {
-					this.loading.all = false
-					if (error.response && error.response.data && error.response.data.ocs && error.response.data.ocs.meta) {
-						const statuscode = error.response.data.ocs.meta.statuscode
-						if (statuscode === 102) {
-							// wrong username
+						.then(() => {
+							this.resetForm()
 							this.$refs.newusername.focus()
-						} else if (statuscode === 107) {
-							// wrong password
-							this.$refs.newuserpassword.focus()
-						}
+						})
+						.catch((error) => {
+							this.loading.all = false
+							if (error.response && error.response.data && error.response.data.ocs && error.response.data.ocs.meta) {
+								const statuscode = error.response.data.ocs.meta.statuscode
+								if (statuscode === 102) {
+									// wrong username
+									this.$refs.newusername.focus()
+								} else if (statuscode === 107) {
+									// wrong password
+									this.$refs.newuserpassword.focus()
+								}
+							}
+						})
+			},
+			setNewUserDefaultGroup(value) {
+				if (value && value.length > 0) {
+					// setting new user default group to the current selected one
+					let currentGroup = this.groups.find(group => group.id === value)
+					if (currentGroup) {
+						this.newUser.groups = [currentGroup]
+						return
 					}
-				})
-		},
-		setNewUserDefaultGroup(value) {
-			if (value && value.length > 0) {
-				// setting new user default group to the current selected one
-				let currentGroup = this.groups.find(group => group.id === value)
-				if (currentGroup) {
-					this.newUser.groups = [currentGroup]
-					return
 				}
-			}
-			// fallback, empty selected group
-			this.newUser.groups = []
-		},
+				// fallback, empty selected group
+				this.newUser.groups = []
+			},
 
-		/**
+			/**
 			 * Create a new group
 			 *
 			 * @param {string} gid Group id
 			 * @returns {Promise}
 			 */
-		createGroup(gid) {
-			this.loading.groups = true
-			this.$store.dispatch('addGroup', gid)
-				.then((group) => {
-					this.newUser.groups.push(this.groups.find(group => group.id === gid))
-					this.loading.groups = false
-				})
-				.catch(() => {
-					this.loading.groups = false
-				})
-			return this.$store.getters.getGroups[this.groups.length]
-		},
+			createGroup(gid) {
+				this.loading.groups = true
+				this.$store.dispatch('addGroup', gid)
+						.then((group) => {
+							this.newUser.groups.push(this.groups.find(group => group.id === gid))
+							this.loading.groups = false
+						})
+						.catch(() => {
+							this.loading.groups = false
+						})
+				return this.$store.getters.getGroups[this.groups.length]
+			},
 
-		/**
+			/**
 			 * If the selected group is the disabled group but the count is 0
 			 * redirect to the all users page.
 			 * * we only check for 0 because we don't have the count on ldap
 			 * * and we therefore set the usercount to -1 in this specific case
 			 */
-		redirectIfDisabled() {
-			const allGroups = this.$store.getters.getGroups
-			if (this.selectedGroup === 'disabled'
-					&& allGroups.findIndex(group => group.id === 'disabled' && group.usercount === 0) > -1) {
-				// disabled group is empty, redirection to all users
-				this.$router.push({ name: 'users' })
-				this.$refs.infiniteLoading.stateChanger.reset()
+			redirectIfDisabled() {
+				const allGroups = this.$store.getters.getGroups
+				if (this.selectedGroup === 'disabled'
+						&& allGroups.findIndex(group => group.id === 'disabled' && group.usercount === 0) > -1) {
+					// disabled group is empty, redirection to all users
+					this.$router.push({ name: 'users' })
+					this.$refs.infiniteLoading.stateChanger.reset()
+				}
 			}
 		}
 	}
-}
 </script>
diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index f0baae70f8134..71941cd5369f3 100644
--- a/apps/settings/src/components/UserList/UserRow.vue
+++ b/apps/settings/src/components/UserList/UserRow.vue
@@ -24,193 +24,208 @@
 
 <template>
 	<!-- Obfuscated user: Logged in user does not have permissions to see all of the data -->
-	<div v-if="Object.keys(user).length ===1" class="row" :data-id="user.id">
-		<div class="avatar" :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}">
-			<img v-if="!loading.delete && !loading.disable && !loading.wipe"
-				alt=""
-				width="32"
-				height="32"
-				:src="generateAvatar(user.id, 32)"
-				:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'">
+	<div :data-id="user.id" class="row" v-if="Object.keys(user).length ===1">
+		<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
+			 class="avatar">
+			<img :src="generateAvatar(user.id, 32)"
+				 :srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
+				 alt=""
+				 height="32"
+				 v-if="!loading.delete && !loading.disable && !loading.wipe"
+				 width="32">
 		</div>
 		<div class="name">
 			{{ user.id }}
 		</div>
 		<div class="obfuscated">
-			{{ t('settings','You do not have permissions to see the details of this user') }}
+			{{ t('settings','You do not have permissions to see the details of
+			this user') }}
 		</div>
 	</div>
 
 	<!-- User full data -->
 	<UserRowSimple
-		v-else-if="!editing"
-		:generate-avatar="generateAvatar"
-		:loading="loading"
-		:show-config="showConfig"
-		:languages="languages"
-		:user="user"
-		:user-actions="userActions"
-		:opened-menu="openedMenu"
-		:feedback-message="feedbackMessage"
-		:sub-admins-groups="subAdminsGroups"
-		:settings="settings"
-		@hideMenu="hideMenu"
-		@toggleMenu="toggleMenu"
-		@edit="editing = true" />
-	<div v-else
-		class="row"
-		:class="{'disabled': loading.delete || loading.disable}"
-		:data-id="user.id">
-		<div class="avatar" :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}">
-			<img v-if="!loading.delete && !loading.disable && !loading.wipe"
-				alt=""
-				width="32"
-				height="32"
-				:src="generateAvatar(user.id, 32)"
-				:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'">
+			:feedback-message="feedbackMessage"
+			:generate-avatar="generateAvatar"
+			:languages="languages"
+			:loading="loading"
+			:opened-menu="openedMenu"
+			:settings="settings"
+			:show-config="showConfig"
+			:sub-admins-groups="subAdminsGroups"
+			:user="user"
+			:user-actions="userActions"
+			@edit="editing = true"
+			@hideMenu="hideMenu"
+			@toggleMenu="toggleMenu"
+			v-else-if="!editing"/>
+	<div :class="{'disabled': loading.delete || loading.disable}"
+		 :data-id="user.id"
+		 class="row row--editable"
+		 v-else>
+		<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
+			 class="avatar">
+			<img :src="generateAvatar(user.id, 32)"
+				 :srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
+				 alt=""
+				 height="32"
+				 v-if="!loading.delete && !loading.disable && !loading.wipe"
+				 width="32">
 		</div>
 		<!-- dirty hack to ellipsis on two lines -->
 		<div class="displayName">
 			<form
-				class="displayName"
-				:class="{'icon-loading-small': loading.displayName}"
-				@submit.prevent="updateDisplayName">
+					:class="{'icon-loading-small': loading.displayName}"
+					@submit.prevent="updateDisplayName"
+					class="displayName">
 				<template v-if="user.backendCapabilities.setDisplayName">
-					<input v-if="user.backendCapabilities.setDisplayName"
-						:id="'displayName'+user.id+rand"
-						ref="displayName"
-						type="text"
-						:disabled="loading.displayName||loading.all"
-						:value="user.displayname"
-						autocomplete="new-password"
-						autocorrect="off"
-						autocapitalize="off"
-						spellcheck="false">
-					<input v-if="user.backendCapabilities.setDisplayName"
-						type="submit"
-						class="icon-confirm"
-						value="">
+					<input :disabled="loading.displayName||loading.all"
+						   :id="'displayName'+user.id+rand"
+						   :value="user.displayname"
+						   autocapitalize="off"
+						   autocomplete="new-password"
+						   autocorrect="off"
+						   ref="displayName"
+						   spellcheck="false"
+						   type="text"
+						   v-if="user.backendCapabilities.setDisplayName">
+					<input class="icon-confirm"
+						   type="submit"
+						   v-if="user.backendCapabilities.setDisplayName"
+						   value="">
 				</template>
-				<div v-else v-tooltip.auto="t('settings', 'The backend does not support changing the display name')" class="name" />
+				<div class="name"
+					 v-else
+					 v-tooltip.auto="t('settings', 'The backend does not support changing the display name')"/>
 			</form>
 		</div>
-		<form v-if="settings.canChangePassword && user.backendCapabilities.setPassword"
-			class="password"
-			:class="{'icon-loading-small': loading.password}"
-			@submit.prevent="updatePassword">
-			<input :id="'password'+user.id+rand"
-				ref="password"
-				type="password"
-				required
-				:disabled="loading.password || loading.all"
-				:minlength="minPasswordLength"
-				value=""
-				:placeholder="t('settings', 'Add new password')"
-				autocomplete="new-password"
-				autocorrect="off"
-				autocapitalize="off"
-				spellcheck="false">
-			<input type="submit" class="icon-confirm" value="">
+		<form :class="{'icon-loading-small': loading.password}"
+			  @submit.prevent="updatePassword"
+			  class="password"
+			  v-if="settings.canChangePassword && user.backendCapabilities.setPassword">
+			<input :disabled="loading.password || loading.all"
+				   :id="'password'+user.id+rand"
+				   :minlength="minPasswordLength"
+				   :placeholder="t('settings', 'Add new password')"
+				   autocapitalize="off"
+				   autocomplete="new-password"
+				   autocorrect="off"
+				   ref="password"
+				   required
+				   spellcheck="false"
+				   type="password"
+				   value="">
+			<input class="icon-confirm" type="submit" value="">
 		</form>
-		<div v-else />
-		<form class="mailAddress" :class="{'icon-loading-small': loading.mailAddress}" @submit.prevent="updateEmail">
-			<input :id="'mailAddress'+user.id+rand"
-				ref="mailAddress"
-				type="email"
-				:disabled="loading.mailAddress||loading.all"
-				:value="user.email"
-				:placeholder="t('settings', 'Add new email address')"
-				autocomplete="new-password"
-				autocorrect="off"
-				autocapitalize="off"
-				spellcheck="false">
-			<input type="submit" class="icon-confirm" value="">
+		<div v-else/>
+		<form :class="{'icon-loading-small': loading.mailAddress}"
+			  @submit.prevent="updateEmail"
+			  class="mailAddress">
+			<input :disabled="loading.mailAddress||loading.all"
+				   :id="'mailAddress'+user.id+rand"
+				   :placeholder="t('settings', 'Add new email address')"
+				   :value="user.email"
+				   autocapitalize="off"
+				   autocomplete="new-password"
+				   autocorrect="off"
+				   ref="mailAddress"
+				   spellcheck="false"
+				   type="email">
+			<input class="icon-confirm" type="submit" value="">
 		</form>
-		<div class="groups" :class="{'icon-loading-small': loading.groups}">
-			<Multiselect :value="userGroups"
-				:options="availableGroups"
-				:disabled="loading.groups||loading.all"
-				tag-placeholder="create"
-				:placeholder="t('settings', 'Add user in group')"
-				label="name"
-				track-by="id"
-				class="multiselect-vue"
-				:limit="2"
-				:multiple="true"
-				:taggable="settings.isAdmin"
-				:close-on-select="false"
-				:tag-width="60"
-				@tag="createGroup"
-				@select="addUserGroup"
-				@remove="removeUserGroup">
+		<div :class="{'icon-loading-small': loading.groups}" class="groups">
+			<Multiselect :close-on-select="false"
+						 :disabled="loading.groups||loading.all"
+						 :limit="2"
+						 :multiple="true"
+						 :options="availableGroups"
+						 :placeholder="t('settings', 'Add user in group')"
+						 :tag-width="60"
+						 :taggable="settings.isAdmin"
+						 :value="userGroups"
+						 @remove="removeUserGroup"
+						 @select="addUserGroup"
+						 @tag="createGroup"
+						 class="multiselect-vue"
+						 label="name"
+						 tag-placeholder="create"
+						 track-by="id">
 				<span slot="noResult">{{ t('settings', 'No results') }}</span>
 			</Multiselect>
 		</div>
-		<div v-if="subAdminsGroups.length>0 && settings.isAdmin" class="subadmins" :class="{'icon-loading-small': loading.subadmins}">
-			<Multiselect :value="userSubAdminsGroups"
-				:options="subAdminsGroups"
-				:disabled="loading.subadmins||loading.all"
-				:placeholder="t('settings', 'Set user as admin for')"
-				label="name"
-				track-by="id"
-				class="multiselect-vue"
-				:limit="2"
-				:multiple="true"
-				:close-on-select="false"
-				:tag-width="60"
-				@select="addUserSubAdmin"
-				@remove="removeUserSubAdmin">
+		<div :class="{'icon-loading-small': loading.subadmins}"
+			 class="subadmins"
+			 v-if="subAdminsGroups.length>0 && settings.isAdmin">
+			<Multiselect :close-on-select="false"
+						 :disabled="loading.subadmins||loading.all"
+						 :limit="2"
+						 :multiple="true"
+						 :options="subAdminsGroups"
+						 :placeholder="t('settings', 'Set user as admin for')"
+						 :tag-width="60"
+						 :value="userSubAdminsGroups"
+						 @remove="removeUserSubAdmin"
+						 @select="addUserSubAdmin"
+						 class="multiselect-vue"
+						 label="name"
+						 track-by="id">
 				<span slot="noResult">{{ t('settings', 'No results') }}</span>
 			</Multiselect>
 		</div>
-		<div v-tooltip.auto="usedSpace" class="quota" :class="{'icon-loading-small': loading.quota}">
-			<Multiselect :value="userQuota"
-				:options="quotaOptions"
-				:disabled="loading.quota||loading.all"
-				tag-placeholder="create"
-				:placeholder="t('settings', 'Select user quota')"
-				label="label"
-				track-by="id"
-				class="multiselect-vue"
-				:allow-empty="false"
-				:taggable="true"
-				@tag="validateQuota"
-				@input="setUserQuota" />
+		<div :class="{'icon-loading-small': loading.quota}" class="quota"
+			 v-tooltip.auto="usedSpace">
+			<Multiselect :allow-empty="false"
+						 :disabled="loading.quota||loading.all"
+						 :options="quotaOptions"
+						 :placeholder="t('settings', 'Select user quota')"
+						 :taggable="true"
+						 :value="userQuota"
+						 @input="setUserQuota"
+						 @tag="validateQuota"
+						 class="multiselect-vue"
+						 label="label"
+						 tag-placeholder="create"
+						 track-by="id"/>
 		</div>
-		<div v-if="showConfig.showLanguages"
-			class="languages"
-			:class="{'icon-loading-small': loading.languages}">
-			<Multiselect :value="userLanguage"
-				:options="languages"
-				:disabled="loading.languages||loading.all"
-				:placeholder="t('settings', 'No language set')"
-				label="name"
-				track-by="code"
-				class="multiselect-vue"
-				:allow-empty="false"
-				group-values="languages"
-				group-label="label"
-				@input="setUserLanguage" />
+		<div :class="{'icon-loading-small': loading.languages}"
+			 class="languages"
+			 v-if="showConfig.showLanguages">
+			<Multiselect :allow-empty="false"
+						 :disabled="loading.languages||loading.all"
+						 :options="languages"
+						 :placeholder="t('settings', 'No language set')"
+						 :value="userLanguage"
+						 @input="setUserLanguage"
+						 class="multiselect-vue"
+						 group-label="label"
+						 group-values="languages"
+						 label="name"
+						 track-by="code"/>
 		</div>
 
 		<!-- don't show this on edit mode -->
-		<div v-if="showConfig.showStoragePath || showConfig.showUserBackend" class="storageLocation" />
-		<div v-if="showConfig.showLastLogin" />
+		<div class="storageLocation"
+			 v-if="showConfig.showStoragePath || showConfig.showUserBackend"/>
+		<div v-if="showConfig.showLastLogin"/>
 
 		<div class="userActions">
-			<div v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all" class="toggleUserActions">
+			<div class="toggleUserActions"
+				 v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all">
 				<Actions>
-					<ActionButton icon="icon-checkmark" @click="editing = false">
+					<ActionButton @click="editing = false"
+								  icon="icon-checkmark">
 						{{ t('settings', 'Done') }}
 					</ActionButton>
 				</Actions>
-				<div v-click-outside="hideMenu" class="icon-more" @click="toggleMenu" />
-				<div class="popovermenu" :class="{ 'open': openedMenu }">
-					<PopoverMenu :menu="userActions" />
+				<div @click="toggleMenu" class="icon-more"
+					 v-click-outside="hideMenu"/>
+				<div :class="{ 'open': openedMenu }" class="popovermenu">
+					<PopoverMenu :menu="userActions"/>
 				</div>
 			</div>
-			<div class="feedback" :style="{opacity: feedbackMessage !== '' ? 1 : 0}">
-				<div class="icon-checkmark" />
+			<div :style="{opacity: feedbackMessage !== '' ? 1 : 0}"
+				 class="feedback">
+				<div class="icon-checkmark"/>
 				{{ feedbackMessage }}
 			</div>
 		</div>
@@ -218,427 +233,444 @@
 </template>
 
 <script>
-import ClickOutside from 'vue-click-outside'
-import Vue from 'vue'
-import VTooltip from 'v-tooltip'
-import { PopoverMenu, Multiselect, Actions, ActionButton } from 'nextcloud-vue'
-import UserRowSimple from './UserRowSimple'
-import UserRowMixin from '../../mixins/UserRowMixin'
-
-Vue.use(VTooltip)
-
-export default {
-	name: 'UserRow',
-	components: {
-		UserRowSimple,
+	import ClickOutside from 'vue-click-outside'
+	import Vue from 'vue'
+	import VTooltip from 'v-tooltip'
+	import {
 		PopoverMenu,
+		Multiselect,
 		Actions,
-		ActionButton,
-		Multiselect
-	},
-	directives: {
-		ClickOutside
-	},
-	mixins: [UserRowMixin],
-	props: {
-		user: {
-			type: Object,
-			required: true
-		},
-		settings: {
-			type: Object,
-			default: () => ({})
-		},
-		groups: {
-			type: Array,
-			default: () => []
-		},
-		subAdminsGroups: {
-			type: Array,
-			default: () => []
-		},
-		quotaOptions: {
-			type: Array,
-			default: () => []
-		},
-		showConfig: {
-			type: Object,
-			default: () => ({})
+		ActionButton
+	} from 'nextcloud-vue'
+	import UserRowSimple from './UserRowSimple'
+	import UserRowMixin from '../../mixins/UserRowMixin'
+
+	Vue.use(VTooltip)
+
+	export default {
+		name: 'UserRow',
+		components: {
+			UserRowSimple,
+			PopoverMenu,
+			Actions,
+			ActionButton,
+			Multiselect
 		},
-		languages: {
-			type: Array,
-			required: true
+		directives: {
+			ClickOutside
 		},
-		externalActions: {
-			type: Array,
-			default: () => []
-		}
-	},
-	data() {
-		return {
-			rand: parseInt(Math.random() * 1000),
-			openedMenu: false,
-			feedbackMessage: '',
-			editing: false,
-			loading: {
-				all: false,
-				displayName: false,
-				password: false,
-				mailAddress: false,
-				groups: false,
-				subadmins: false,
-				quota: false,
-				delete: false,
-				disable: false,
-				languages: false,
-				wipe: false
+		mixins: [UserRowMixin],
+		props: {
+			user: {
+				type: Object,
+				required: true
+			},
+			settings: {
+				type: Object,
+				default: () => ({})
+			},
+			groups: {
+				type: Array,
+				default: () => []
+			},
+			subAdminsGroups: {
+				type: Array,
+				default: () => []
+			},
+			quotaOptions: {
+				type: Array,
+				default: () => []
+			},
+			showConfig: {
+				type: Object,
+				default: () => ({})
+			},
+			languages: {
+				type: Array,
+				required: true
+			},
+			externalActions: {
+				type: Array,
+				default: () => []
 			}
-		}
-	},
-	computed: {
-		/* USER POPOVERMENU ACTIONS */
-		userActions() {
-			let actions = [
-				{
-					icon: 'icon-delete',
-					text: t('settings', 'Delete user'),
-					action: this.deleteUser
-				},
-				{
-					icon: 'icon-delete',
-					text: t('settings', 'Wipe all devices'),
-					action: this.wipeUserDevices
-				},
-				{
-					icon: this.user.enabled ? 'icon-close' : 'icon-add',
-					text: this.user.enabled ? t('settings', 'Disable user') : t('settings', 'Enable user'),
-					action: this.enableDisableUser
+		},
+		data() {
+			return {
+				rand: parseInt(Math.random() * 1000),
+				openedMenu: false,
+				feedbackMessage: '',
+				editing: false,
+				loading: {
+					all: false,
+					displayName: false,
+					password: false,
+					mailAddress: false,
+					groups: false,
+					subadmins: false,
+					quota: false,
+					delete: false,
+					disable: false,
+					languages: false,
+					wipe: false
 				}
-			]
-			if (this.user.email !== null && this.user.email !== '') {
-				actions.push({
-					icon: 'icon-mail',
-					text: t('settings', 'Resend welcome email'),
-					action: this.sendWelcomeMail
-				})
 			}
-			return actions.concat(this.externalActions)
-		}
-	},
-
-	methods: {
-		/* MENU HANDLING */
-		toggleMenu() {
-			this.openedMenu = !this.openedMenu
 		},
-		hideMenu() {
-			this.openedMenu = false
-		},
-
-		wipeUserDevices() {
-			let userid = this.user.id
-			OC.dialogs.confirmDestructive(
-				t('settings', 'In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet.', { userid: userid }),
-				t('settings', 'Remote wipe of devices'),
-				{
-					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('settings', 'Wipe {userid}\'s devices', { userid: userid }),
-					confirmClasses: 'error',
-					cancel: t('settings', 'Cancel')
-				},
-				(result) => {
-					if (result) {
-						this.loading.wipe = true
-						this.loading.all = true
-						this.$store.dispatch('wipeUserDevices', userid)
-							.then(() => {
-								this.loading.wipe = false
-								this.loading.all = false
-							})
+		computed: {
+			/* USER POPOVERMENU ACTIONS */
+			userActions() {
+				let actions = [
+					{
+						icon: 'icon-delete',
+						text: t('settings', 'Delete user'),
+						action: this.deleteUser
+					},
+					{
+						icon: 'icon-delete',
+						text: t('settings', 'Wipe all devices'),
+						action: this.wipeUserDevices
+					},
+					{
+						icon: this.user.enabled ? 'icon-close' : 'icon-add',
+						text: this.user.enabled ? t('settings', 'Disable user') : t('settings', 'Enable user'),
+						action: this.enableDisableUser
 					}
-				},
-				true
-			)
+				]
+				if (this.user.email !== null && this.user.email !== '') {
+					actions.push({
+						icon: 'icon-mail',
+						text: t('settings', 'Resend welcome email'),
+						action: this.sendWelcomeMail
+					})
+				}
+				return actions.concat(this.externalActions)
+			}
 		},
 
-		deleteUser() {
-			let userid = this.user.id
-			OC.dialogs.confirmDestructive(
-				t('settings', 'Fully delete {userid}\'s account including all their personal files, app data, etc.', { userid: userid }),
-				t('settings', 'Account deletion'),
-				{
-					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('settings', 'Delete {userid}\'s account', { userid: userid }),
-					confirmClasses: 'error',
-					cancel: t('settings', 'Cancel')
-				},
-				(result) => {
-					if (result) {
-						this.loading.delete = true
-						this.loading.all = true
-						return this.$store.dispatch('deleteUser', userid)
-							.then(() => {
-								this.loading.delete = false
-								this.loading.all = false
-							})
-					}
-				},
-				true
-			)
-		},
+		methods: {
+			/* MENU HANDLING */
+			toggleMenu() {
+				this.openedMenu = !this.openedMenu
+			},
+			hideMenu() {
+				this.openedMenu = false
+			},
+
+			wipeUserDevices() {
+				let userid = this.user.id
+				OC.dialogs.confirmDestructive(
+						t('settings', 'In case of lost device or exiting the organization, this can remotely wipe the Nextcloud data from all devices associated with {userid}. Only works if the devices are connected to the internet.', { userid: userid }),
+						t('settings', 'Remote wipe of devices'),
+						{
+							type: OC.dialogs.YES_NO_BUTTONS,
+							confirm: t('settings', 'Wipe {userid}\'s devices', { userid: userid }),
+							confirmClasses: 'error',
+							cancel: t('settings', 'Cancel')
+						},
+						(result) => {
+							if (result) {
+								this.loading.wipe = true
+								this.loading.all = true
+								this.$store.dispatch('wipeUserDevices', userid)
+										.then(() => {
+											this.loading.wipe = false
+											this.loading.all = false
+										})
+							}
+						},
+						true
+				)
+			},
+
+			deleteUser() {
+				let userid = this.user.id
+				OC.dialogs.confirmDestructive(
+						t('settings', 'Fully delete {userid}\'s account including all their personal files, app data, etc.', { userid: userid }),
+						t('settings', 'Account deletion'),
+						{
+							type: OC.dialogs.YES_NO_BUTTONS,
+							confirm: t('settings', 'Delete {userid}\'s account', { userid: userid }),
+							confirmClasses: 'error',
+							cancel: t('settings', 'Cancel')
+						},
+						(result) => {
+							if (result) {
+								this.loading.delete = true
+								this.loading.all = true
+								return this.$store.dispatch('deleteUser', userid)
+										.then(() => {
+											this.loading.delete = false
+											this.loading.all = false
+										})
+							}
+						},
+						true
+				)
+			},
 
-		enableDisableUser() {
-			this.loading.delete = true
-			this.loading.all = true
-			let userid = this.user.id
-			let enabled = !this.user.enabled
-			return this.$store.dispatch('enableDisableUser', { userid, enabled })
-				.then(() => {
-					this.loading.delete = false
-					this.loading.all = false
+			enableDisableUser() {
+				this.loading.delete = true
+				this.loading.all = true
+				let userid = this.user.id
+				let enabled = !this.user.enabled
+				return this.$store.dispatch('enableDisableUser', {
+					userid,
+					enabled
 				})
-		},
+						.then(() => {
+							this.loading.delete = false
+							this.loading.all = false
+						})
+			},
 
-		/**
-		 * Set user displayName
-		 *
-		 * @param {string} displayName The display name
-		 */
-		updateDisplayName() {
-			let displayName = this.$refs.displayName.value
-			this.loading.displayName = true
-			this.$store.dispatch('setUserData', {
-				userid: this.user.id,
-				key: 'displayname',
-				value: displayName
-			}).then(() => {
-				this.loading.displayName = false
-				this.$refs.displayName.value = displayName
-			})
-		},
+			/**
+			 * Set user displayName
+			 *
+			 * @param {string} displayName The display name
+			 */
+			updateDisplayName() {
+				let displayName = this.$refs.displayName.value
+				this.loading.displayName = true
+				this.$store.dispatch('setUserData', {
+					userid: this.user.id,
+					key: 'displayname',
+					value: displayName
+				}).then(() => {
+					this.loading.displayName = false
+					this.$refs.displayName.value = displayName
+				})
+			},
 
-		/**
-		 * Set user password
-		 *
-		 * @param {string} password The email adress
-		 */
-		updatePassword() {
-			let password = this.$refs.password.value
-			this.loading.password = true
-			this.$store.dispatch('setUserData', {
-				userid: this.user.id,
-				key: 'password',
-				value: password
-			}).then(() => {
-				this.loading.password = false
-				this.$refs.password.value = '' // empty & show placeholder
-			})
-		},
+			/**
+			 * Set user password
+			 *
+			 * @param {string} password The email adress
+			 */
+			updatePassword() {
+				let password = this.$refs.password.value
+				this.loading.password = true
+				this.$store.dispatch('setUserData', {
+					userid: this.user.id,
+					key: 'password',
+					value: password
+				}).then(() => {
+					this.loading.password = false
+					this.$refs.password.value = '' // empty & show placeholder
+				})
+			},
 
-		/**
-		 * Set user mailAddress
-		 *
-		 * @param {string} mailAddress The email adress
-		 */
-		updateEmail() {
-			let mailAddress = this.$refs.mailAddress.value
-			this.loading.mailAddress = true
-			this.$store.dispatch('setUserData', {
-				userid: this.user.id,
-				key: 'email',
-				value: mailAddress
-			}).then(() => {
-				this.loading.mailAddress = false
-				this.$refs.mailAddress.value = mailAddress
-			})
-		},
+			/**
+			 * Set user mailAddress
+			 *
+			 * @param {string} mailAddress The email adress
+			 */
+			updateEmail() {
+				let mailAddress = this.$refs.mailAddress.value
+				this.loading.mailAddress = true
+				this.$store.dispatch('setUserData', {
+					userid: this.user.id,
+					key: 'email',
+					value: mailAddress
+				}).then(() => {
+					this.loading.mailAddress = false
+					this.$refs.mailAddress.value = mailAddress
+				})
+			},
 
-		/**
-		 * Create a new group and add user to it
-		 *
-		 * @param {string} gid Group id
-		*/
-		async createGroup(gid) {
-			this.loading = { groups: true, subadmins: true }
-			try {
-				await this.$store.dispatch('addGroup', gid)
-				let userid = this.user.id
-				await this.$store.dispatch('addUserGroup', { userid, gid })
-			} catch (error) {
-				console.error(error)
-			} finally {
-				this.loading = { groups: false, subadmins: false }
-			}
-			return this.$store.getters.getGroups[this.groups.length]
-		},
+			/**
+			 * Create a new group and add user to it
+			 *
+			 * @param {string} gid Group id
+			 */
+			async createGroup(gid) {
+				this.loading = { groups: true, subadmins: true }
+				try {
+					await this.$store.dispatch('addGroup', gid)
+					let userid = this.user.id
+					await this.$store.dispatch('addUserGroup', { userid, gid })
+				} catch (error) {
+					console.error(error)
+				} finally {
+					this.loading = { groups: false, subadmins: false }
+				}
+				return this.$store.getters.getGroups[this.groups.length]
+			},
 
-		/**
-		 * Add user to group
-		 *
-		 * @param {object} group Group object
-		 */
-		async addUserGroup(group) {
-			if (group.canAdd === false) {
-				return false
-			}
-			this.loading.groups = true
-			let userid = this.user.id
-			let gid = group.id
-			try {
-				await this.$store.dispatch('addUserGroup', { userid, gid })
-			} catch (error) {
-				console.error(error)
-			} finally {
-				this.loading.groups = false
-			}
-		},
+			/**
+			 * Add user to group
+			 *
+			 * @param {object} group Group object
+			 */
+			async addUserGroup(group) {
+				if (group.canAdd === false) {
+					return false
+				}
+				this.loading.groups = true
+				let userid = this.user.id
+				let gid = group.id
+				try {
+					await this.$store.dispatch('addUserGroup', { userid, gid })
+				} catch (error) {
+					console.error(error)
+				} finally {
+					this.loading.groups = false
+				}
+			},
 
-		/**
-		 * Remove user from group
-		 *
-		 * @param {object} group Group object
-		 */
-		async removeUserGroup(group) {
-			if (group.canRemove === false) {
-				return false
-			}
+			/**
+			 * Remove user from group
+			 *
+			 * @param {object} group Group object
+			 */
+			async removeUserGroup(group) {
+				if (group.canRemove === false) {
+					return false
+				}
 
-			this.loading.groups = true
-			let userid = this.user.id
-			let gid = group.id
+				this.loading.groups = true
+				let userid = this.user.id
+				let gid = group.id
 
-			try {
-				await this.$store.dispatch('removeUserGroup', { userid, gid })
-				this.loading.groups = false
-				// remove user from current list if current list is the removed group
-				if (this.$route.params.selectedGroup === gid) {
-					this.$store.commit('deleteUser', userid)
+				try {
+					await this.$store.dispatch('removeUserGroup', {
+						userid,
+						gid
+					})
+					this.loading.groups = false
+					// remove user from current list if current list is the removed group
+					if (this.$route.params.selectedGroup === gid) {
+						this.$store.commit('deleteUser', userid)
+					}
+				} catch {
+					this.loading.groups = false
 				}
-			} catch {
-				this.loading.groups = false
-			}
-		},
+			},
 
-		/**
-		 * Add user to group
-		 *
-		 * @param {object} group Group object
-		 */
-		async addUserSubAdmin(group) {
-			this.loading.subadmins = true
-			let userid = this.user.id
-			let gid = group.id
+			/**
+			 * Add user to group
+			 *
+			 * @param {object} group Group object
+			 */
+			async addUserSubAdmin(group) {
+				this.loading.subadmins = true
+				let userid = this.user.id
+				let gid = group.id
 
-			try {
-				await this.$store.dispatch('addUserSubAdmin', { userid, gid })
-				this.loading.subadmins = false
-			} catch (error) {
-				console.error(error)
-			}
-		},
+				try {
+					await this.$store.dispatch('addUserSubAdmin', {
+						userid,
+						gid
+					})
+					this.loading.subadmins = false
+				} catch (error) {
+					console.error(error)
+				}
+			},
 
-		/**
-		 * Remove user from group
-		 *
-		 * @param {object} group Group object
-		 */
-		async removeUserSubAdmin(group) {
-			this.loading.subadmins = true
-			let userid = this.user.id
-			let gid = group.id
+			/**
+			 * Remove user from group
+			 *
+			 * @param {object} group Group object
+			 */
+			async removeUserSubAdmin(group) {
+				this.loading.subadmins = true
+				let userid = this.user.id
+				let gid = group.id
 
-			try {
-				await this.$store.dispatch('removeUserSubAdmin', { userid, gid })
-			} catch (error) {
-				console.error(error)
-			} finally {
-				this.loading.subadmins = false
-			}
-		},
+				try {
+					await this.$store.dispatch('removeUserSubAdmin', {
+						userid,
+						gid
+					})
+				} catch (error) {
+					console.error(error)
+				} finally {
+					this.loading.subadmins = false
+				}
+			},
 
-		/**
-		 * Dispatch quota set request
-		 *
-		 * @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
-		 * @returns {string}
-		 */
-		async setUserQuota(quota = 'none') {
-			this.loading.quota = true
-			// ensure we only send the preset id
-			quota = quota.id ? quota.id : quota
+			/**
+			 * Dispatch quota set request
+			 *
+			 * @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
+			 * @returns {string}
+			 */
+			async setUserQuota(quota = 'none') {
+				this.loading.quota = true
+				// ensure we only send the preset id
+				quota = quota.id ? quota.id : quota
 
-			try {
-				await this.$store.dispatch('setUserData', {
-					userid: this.user.id,
-					key: 'quota',
-					value: quota
-				})
-			} catch (error) {
-				console.error(error)
-			} finally {
-				this.loading.quota = false
-			}
-			return quota
-		},
+				try {
+					await this.$store.dispatch('setUserData', {
+						userid: this.user.id,
+						key: 'quota',
+						value: quota
+					})
+				} catch (error) {
+					console.error(error)
+				} finally {
+					this.loading.quota = false
+				}
+				return quota
+			},
 
-		/**
-		 * Validate quota string to make sure it's a valid human file size
-		 *
-		 * @param {string} quota Quota in readable format '5 GB'
-		 * @returns {Promise|boolean}
-		 */
-		validateQuota(quota) {
-			// only used for new presets sent through @Tag
-			let validQuota = OC.Util.computerFileSize(quota)
-			if (validQuota !== null && validQuota >= 0) {
-				// unify format output
-				return this.setUserQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)))
-			}
-			// if no valid do not change
-			return false
-		},
+			/**
+			 * Validate quota string to make sure it's a valid human file size
+			 *
+			 * @param {string} quota Quota in readable format '5 GB'
+			 * @returns {Promise|boolean}
+			 */
+			validateQuota(quota) {
+				// only used for new presets sent through @Tag
+				let validQuota = OC.Util.computerFileSize(quota)
+				if (validQuota !== null && validQuota >= 0) {
+					// unify format output
+					return this.setUserQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)))
+				}
+				// if no valid do not change
+				return false
+			},
 
-		/**
-		 * Dispatch language set request
-		 *
-		 * @param {Object} lang language object {code:'en', name:'English'}
-		 * @returns {Object}
-		 */
-		async setUserLanguage(lang) {
-			this.loading.languages = true
-			// ensure we only send the preset id
-			try {
-				await this.$store.dispatch('setUserData', {
-					userid: this.user.id,
-					key: 'language',
-					value: lang.code
-				})
-			} catch (error) {
-				console.error(error)
-			} finally {
-				this.loading.languages = false
+			/**
+			 * Dispatch language set request
+			 *
+			 * @param {Object} lang language object {code:'en', name:'English'}
+			 * @returns {Object}
+			 */
+			async setUserLanguage(lang) {
+				this.loading.languages = true
+				// ensure we only send the preset id
+				try {
+					await this.$store.dispatch('setUserData', {
+						userid: this.user.id,
+						key: 'language',
+						value: lang.code
+					})
+				} catch (error) {
+					console.error(error)
+				} finally {
+					this.loading.languages = false
+				}
+				return lang
+			},
+
+			/**
+			 * Dispatch new welcome mail request
+			 */
+			sendWelcomeMail() {
+				this.loading.all = true
+				this.$store.dispatch('sendWelcomeMail', this.user.id)
+						.then(success => {
+							if (success) {
+								// Show feedback to indicate the success
+								this.feedbackMessage = t('setting', 'Welcome mail sent!')
+								setTimeout(() => {
+									this.feedbackMessage = ''
+								}, 2000)
+							}
+							this.loading.all = false
+						})
 			}
-			return lang
-		},
 
-		/**
-		 * Dispatch new welcome mail request
-		 */
-		sendWelcomeMail() {
-			this.loading.all = true
-			this.$store.dispatch('sendWelcomeMail', this.user.id)
-				.then(success => {
-					if (success) {
-						// Show feedback to indicate the success
-						this.feedbackMessage = t('setting', 'Welcome mail sent!')
-						setTimeout(() => {
-							this.feedbackMessage = ''
-						}, 2000)
-					}
-					this.loading.all = false
-				})
 		}
-
 	}
-}
 </script>
diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
index 157a57eb3ae6b..93ff2ce1614c3 100644
--- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
@@ -1,9 +1,10 @@
 <?php
 
 /**
- * 
+ *
  * @copyright Copyright (c) 2017, Daniel Calviño Sánchez (danxuliu@gmail.com)
  * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2019, Greta Doci <gretadoci@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -33,7 +34,7 @@ class UsersSettingsContext implements Context, ActorAwareInterface {
 	 */
 	public static function newUserForm() {
 		return Locator::forThe()->id("new-user")->
-				describedAs("New user form in Users Settings");
+		describedAs("New user form in Users Settings");
 	}
 
 	/**
@@ -41,7 +42,7 @@ public static function newUserForm() {
 	 */
 	public static function userNameFieldForNewUser() {
 		return Locator::forThe()->field("newusername")->
-				describedAs("User name field for new user in Users Settings");
+		describedAs("User name field for new user in Users Settings");
 	}
 
 	/**
@@ -49,7 +50,7 @@ public static function userNameFieldForNewUser() {
 	 */
 	public static function displayNameFieldForNewUser() {
 		return Locator::forThe()->field("newdisplayname")->
-				describedAs("Display name field for new user in Users Settings");
+		describedAs("Display name field for new user in Users Settings");
 	}
 
 	/**
@@ -57,7 +58,7 @@ public static function displayNameFieldForNewUser() {
 	 */
 	public static function passwordFieldForNewUser() {
 		return Locator::forThe()->field("newuserpassword")->
-				describedAs("Password field for new user in Users Settings");
+		describedAs("Password field for new user in Users Settings");
 	}
 
 	/**
@@ -65,7 +66,7 @@ public static function passwordFieldForNewUser() {
 	 */
 	public static function newUserButton() {
 		return Locator::forThe()->id("new-user-button")->
-				describedAs("New user button in Users Settings");
+		describedAs("New user button in Users Settings");
 	}
 
 	/**
@@ -73,7 +74,7 @@ public static function newUserButton() {
 	 */
 	public static function createNewUserButton() {
 		return Locator::forThe()->xpath("//form[@id = 'new-user']//input[@type = 'submit']")->
-				describedAs("Create user button in Users Settings");
+		describedAs("Create user button in Users Settings");
 	}
 
 	/**
@@ -81,18 +82,18 @@ public static function createNewUserButton() {
 	 */
 	public static function rowForUser($user) {
 		return Locator::forThe()->xpath("//div[@id='app-content']/div/div[normalize-space() = '$user']/..")->
-				describedAs("Row for user $user in Users Settings");
+		describedAs("Row for user $user in Users Settings");
 	}
 
 	/**
 	 * Warning: you need to watch out for the proper classes order
-	 * 
+	 *
 	 * @return Locator
 	 */
 	public static function classCellForUser($class, $user) {
 		return Locator::forThe()->xpath("//*[contains(concat(' ', normalize-space(@class), ' '), ' $class ')]")->
-				descendantOf(self::rowForUser($user))->
-				describedAs("$class cell for user $user in Users Settings");
+		descendantOf(self::rowForUser($user))->
+		describedAs("$class cell for user $user in Users Settings");
 	}
 
 	/**
@@ -100,8 +101,8 @@ public static function classCellForUser($class, $user) {
 	 */
 	public static function inputForUserInCell($cell, $user) {
 		return Locator::forThe()->css("input")->
-				descendantOf(self::classCellForUser($cell, $user))->
-				describedAs("$cell input for user $user in Users Settings");
+		descendantOf(self::classCellForUser($cell, $user))->
+		describedAs("$cell input for user $user in Users Settings");
 	}
 
 	/**
@@ -116,8 +117,8 @@ public static function displayNameCellForUser($user) {
 	 */
 	public static function optionInInputForUser($cell, $user) {
 		return Locator::forThe()->css(".multiselect__option--highlight")->
-				descendantOf(self::classCellForUser($cell, $user))->
-				describedAs("Selected $cell option in $cell input for user $user in Users Settings");
+		descendantOf(self::classCellForUser($cell, $user))->
+		describedAs("Selected $cell option in $cell input for user $user in Users Settings");
 	}
 
 	/**
@@ -125,8 +126,8 @@ public static function optionInInputForUser($cell, $user) {
 	 */
 	public static function actionsMenuOf($user) {
 		return Locator::forThe()->css(".icon-more")->
-				descendantOf(self::rowForUser($user))->
-				describedAs("Actions menu for user $user in Users Settings");
+		descendantOf(self::rowForUser($user))->
+		describedAs("Actions menu for user $user in Users Settings");
 	}
 
 	/**
@@ -134,8 +135,8 @@ public static function actionsMenuOf($user) {
 	 */
 	public static function theAction($action, $user) {
 		return Locator::forThe()->xpath("//button[normalize-space() = '$action']")->
-				descendantOf(self::rowForUser($user))->
-				describedAs("$action action for the user $user row in Users Settings");
+		descendantOf(self::rowForUser($user))->
+		describedAs("$action action for the user $user row in Users Settings");
 	}
 
 	/**
@@ -143,7 +144,7 @@ public static function theAction($action, $user) {
 	 */
 	public static function theColumn($column) {
 		return Locator::forThe()->xpath("//div[@class='user-list-grid']//div[normalize-space() = '$column']")->
-				describedAs("The $column column in Users Settings");
+		describedAs("The $column column in Users Settings");
 	}
 
 	/**
@@ -151,8 +152,8 @@ public static function theColumn($column) {
 	 */
 	public static function selectedSelectOption($cell, $user) {
 		return Locator::forThe()->css(".multiselect__single")->
-				descendantOf(self::classCellForUser($cell, $user))->
-				describedAs("The selected option of the $cell select for the user $user in Users Settings");
+		descendantOf(self::classCellForUser($cell, $user))->
+		describedAs("The selected option of the $cell select for the user $user in Users Settings");
 	}
 
 	/**
@@ -160,8 +161,16 @@ public static function selectedSelectOption($cell, $user) {
 	 */
 	public static function editModeToggle($user) {
 		return Locator::forThe()->css(".toggleUserActions button.icon-rename")->
-				descendantOf(self::rowForUser($user))->
-				describedAs("The edit toggle button for the user $user in Users Settings");
+		descendantOf(self::rowForUser($user))->
+		describedAs("The edit toggle button for the user $user in Users Settings");
+	}
+
+	/**
+	 * @return Locator
+	 */
+	public static function editModeOn($user) {
+		return Locator::forThe()->css("div.user-list-grid div.row.row--editable[data-id=$user]")->
+		describedAs("I see the edit mode is on for the user $user in Users Settings");
 	}
 
 	/**
@@ -220,6 +229,13 @@ public function iToggleTheEditModeForUser($user) {
 		$this->actor->find(self::editModeToggle($user), 10)->click();
 	}
 
+	/**
+	 * @When I see the edit mode is on
+	 */
+	public function ISeeTheEditModeIsOn($user) {
+		$this->actor->find(self::editModeOn($user), 10)->click();
+	}
+
 	/**
 	 * @When I create user :user with password :password
 	 */
@@ -274,7 +290,7 @@ public function iSeeThatTheListOfUsersDoesNotContainsTheUser($user) {
 	 */
 	public function iSeeThatTheNewUserFormIsShown() {
 		PHPUnit_Framework_Assert::assertTrue(
-				$this->actor->find(self::newUserForm(), 10)->isVisible());
+			$this->actor->find(self::newUserForm(), 10)->isVisible());
 	}
 
 	/**
@@ -282,7 +298,7 @@ public function iSeeThatTheNewUserFormIsShown() {
 	 */
 	public function iSeeTheAction($action, $user) {
 		PHPUnit_Framework_Assert::assertTrue(
-				$this->actor->find(self::theAction($action, $user), 10)->isVisible());
+			$this->actor->find(self::theAction($action, $user), 10)->isVisible());
 	}
 
 	/**
@@ -290,7 +306,7 @@ public function iSeeTheAction($action, $user) {
 	 */
 	public function iSeeThatTheColumnIsShown($column) {
 		PHPUnit_Framework_Assert::assertTrue(
-				$this->actor->find(self::theColumn($column), 10)->isVisible());
+			$this->actor->find(self::theColumn($column), 10)->isVisible());
 	}
 
 	/**
@@ -312,8 +328,8 @@ public function iSeeThatTheDisplayNameForTheUserIs($user, $displayName) {
 	 * @Then I see that the :cell cell for user :user is done loading
 	 */
 	public function iSeeThatTheCellForUserIsDoneLoading($cell, $user) {
-		WaitFor::elementToBeEventuallyShown($this->actor, self::classCellForUser($cell.' icon-loading-small', $user));
-		WaitFor::elementToBeEventuallyNotShown($this->actor, self::classCellForUser($cell.' icon-loading-small', $user));
+		WaitFor::elementToBeEventuallyShown($this->actor, self::classCellForUser($cell . ' icon-loading-small', $user));
+		WaitFor::elementToBeEventuallyNotShown($this->actor, self::classCellForUser($cell . ' icon-loading-small', $user));
 	}
 
 	/**
@@ -323,6 +339,6 @@ public function iSeeThatTheuserQuotaIs($user, $quota) {
 		PHPUnit_Framework_Assert::assertEquals(
 			$this->actor->find(self::selectedSelectOption('quota', $user), 2)->getText(), $quota);
 	}
-	
+
 
 }
diff --git a/tests/acceptance/features/users.feature b/tests/acceptance/features/users.feature
index 4cb9fc861739a..2bc58957dfa6a 100644
--- a/tests/acceptance/features/users.feature
+++ b/tests/acceptance/features/users.feature
@@ -1,56 +1,56 @@
 @apache
 Feature: users
 
-  Scenario: create a new user
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I click the New user button
-    And I see that the new user form is shown
-    When I create user unknownUser with password 123456acb
-    Then I see that the list of users contains the user unknownUser
+	Scenario: create a new user
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I click the New user button
+		And I see that the new user form is shown
+		When I create user unknownUser with password 123456acb
+		Then I see that the list of users contains the user unknownUser
 
-  Scenario: create a new user with a custom display name
-    Given I am logged in as the admin
-    And I open the User settings
-    When I click the New user button
-    And I see that the new user form is shown
-    And I set the user name for the new user to "test"
-    And I set the display name for the new user to "Test display name"
-    And I set the password for the new user to "123456acb"
-    And I create the new user
-    Then I see that the list of users contains the user "test"
+	Scenario: create a new user with a custom display name
+		Given I am logged in as the admin
+		And I open the User settings
+		When I click the New user button
+		And I see that the new user form is shown
+		And I set the user name for the new user to "test"
+		And I set the display name for the new user to "Test display name"
+		And I set the password for the new user to "123456acb"
+		And I create the new user
+		Then I see that the list of users contains the user "test"
 #    And I see that the display name for the user "test" is "Test display name"
 
-  Scenario: delete a user
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    And I open the actions menu for the user user0
+	Scenario: delete a user
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I see that the list of users contains the user user0
+		And I open the actions menu for the user user0
 #    And I see that the "Delete user" action in the user0 actions menu is shown
 #    When I click the "Delete user" action in the user0 actions menu
 #    Then I see that the list of users does not contains the user user0
 
-  Scenario: disable a user
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    And I open the actions menu for the user user0
+	Scenario: disable a user
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I see that the list of users contains the user user0
+		And I open the actions menu for the user user0
 #    And I see that the "Disable user" action in the user0 actions menu is shown
 #    When I click the "Disable user" action in the user0 actions menu
 #    Then I see that the list of users does not contains the user user0
 #    When I open the "Disabled users" section
 #    Then I see that the list of users contains the user user0
 
-  Scenario: users navigation without disabled users
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I open the "Disabled users" section
-    And I see that the list of users contains the user disabledUser
-    And I open the actions menu for the user disabledUser
+	Scenario: users navigation without disabled users
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I open the "Disabled users" section
+		And I see that the list of users contains the user disabledUser
+		And I open the actions menu for the user disabledUser
 #    And I see that the "Enable user" action in the disabledUser actions menu is shown
 #    When I click the "Enable user" action in the disabledUser actions menu
 #    Then I see that the section "Disabled users" is not shown
@@ -58,23 +58,25 @@ Feature: users
 #    When I open the User settings
 #    Then I see that the section "Disabled users" is not shown
 
-  Scenario: assign user to a group
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    # disabled because we need the TAB patch: 
+	Scenario: assign user to a group
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		When I toggle the edit mode for the user0
+		Then I see that the edit mode is on
+		And I see that the list of users contains the user user0
+    # disabled because we need the TAB patch:
     # https://github.com/minkphp/MinkSelenium2Driver/pull/244
     # When I assign the user user0 to the group admin
     # Then I see that the section Admins is shown
     # And I see that the section Admins has a count of 2
-  
-  Scenario: create and delete a group
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    # disabled because we need the TAB patch: 
+
+	Scenario: create and delete a group
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I see that the list of users contains the user user0
+    # disabled because we need the TAB patch:
     # https://github.com/minkphp/MinkSelenium2Driver/pull/244
     # And I assign the user user0 to the group Group1
     # And I see that the section Group1 is shown
@@ -83,10 +85,10 @@ Feature: users
     # When I click the "Yes" button of the confirmation dialog
     # Then I see that the section Group1 is not shown
 
-  Scenario: delete an empty group
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
+	Scenario: delete an empty group
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
     # disabled because we need the TAB patch:
     # https://github.com/minkphp/MinkSelenium2Driver/pull/244
     # And I assign the user user0 to the group Group1
@@ -98,21 +100,21 @@ Feature: users
     # When I click the "Yes" button of the confirmation dialog
     # Then I see that the section Group1 is not shown
 
-  Scenario: change columns visibility
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I open the settings
-    And I see that the settings are opened
-    When I toggle the showLanguages checkbox in the settings
-    Then I see that the "Language" column is shown
-    When I toggle the showLastLogin checkbox in the settings
-    Then I see that the "Last login" column is shown
-    When I toggle the showStoragePath checkbox in the settings
-    Then I see that the "Storage location" column is shown
-    When I toggle the showUserBackend checkbox in the settings
-    Then I see that the "User backend" column is shown
-    
+	Scenario: change columns visibility
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I open the settings
+		And I see that the settings are opened
+		When I toggle the showLanguages checkbox in the settings
+		Then I see that the "Language" column is shown
+		When I toggle the showLastLogin checkbox in the settings
+		Then I see that the "Last login" column is shown
+		When I toggle the showStoragePath checkbox in the settings
+		Then I see that the "Storage location" column is shown
+		When I toggle the showUserBackend checkbox in the settings
+		Then I see that the "User backend" column is shown
+
 #  Scenario: change display name
 #    Given I act as Jane
 #    And I am logged in as the admin
@@ -123,16 +125,18 @@ Feature: users
 #    And I see that the displayName cell for user user0 is done loading
 #    Then I see that the displayName of user0 is user1
 
-  Scenario: change password
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    And I see that the password of user0 is ""
-    When I set the password for user0 to 123456
-    And I see that the password cell for user user0 is done loading
+	Scenario: change password
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I see that the list of users contains the user user0
+		When I toggle the edit mode for the user0
+		Then I see that the edit mode is on
+		And I see that the password of user0 is ""
+		When I set the password for user0 to 123456
+		And I see that the password cell for user user0 is done loading
     # password input is emptied on change
-    Then I see that the password of user0 is ""
+		Then I see that the password of user0 is ""
 
 #  Scenario: change email
 #    Given I act as Jane
@@ -144,15 +148,15 @@ Feature: users
 #    And I see that the mailAddress cell for user user0 is done loading
 #    Then I see that the mailAddress of user0 is "test@nextcloud.com"
 
-  Scenario: change user quota
-    Given I act as Jane
-    And I am logged in as the admin
-    And I open the User settings
-    And I see that the list of users contains the user user0
-    When I toggle the edit mode for the user user0
-    Then I see that the edit mode is on
-    And I see that the user quota of user0 is Unlimited
-    # disabled because we need the TAB patch: 
+	Scenario: change user quota
+		Given I act as Jane
+		And I am logged in as the admin
+		And I open the User settings
+		And I see that the list of users contains the user user0
+		When I toggle the edit mode for the user user0
+		Then I see that the edit mode is on
+		And I see that the user quota of user0 is Unlimited
+    # disabled because we need the TAB patch:
     # https://github.com/minkphp/MinkSelenium2Driver/pull/244
     # When I set the user user0 quota to 1GB
     # And I see that the quota cell for user user0 is done loading
@@ -165,4 +169,4 @@ Feature: users
     # Then I see that the user quota of user0 is "0 B"
     # When I set the user user0 quota to Default
     # And I see that the quota cell for user user0 is done loading
-    # Then I see that the user quota of user0 is "Default quota"
\ No newline at end of file
+    # Then I see that the user quota of user0 is "Default quota"