diff --git a/www/comps/admin/admin.css b/www/comps/admin/admin.css
index 9e5918f4..9497c71c 100644
--- a/www/comps/admin/admin.css
+++ b/www/comps/admin/admin.css
@@ -77,6 +77,11 @@
 	padding:0px;
 	min-height:630px;
 }
+.admin-login .login-details .login-details-content-message{
+	display:flex;
+	font-size:105%;
+	margin:10px 12px;
+}
 .admin-login .login-details-login-form-input{
 	min-width:300px;
 }
diff --git a/www/comps/admin/adminLogin.js b/www/comps/admin/adminLogin.js
index 07320faa..f17ca043 100644
--- a/www/comps/admin/adminLogin.js
+++ b/www/comps/admin/adminLogin.js
@@ -4,6 +4,7 @@ import MyTabs           from '../tabs.js';
 import MyInputSelect    from '../inputSelect.js';
 import {getLoginIcon}   from '../shared/admin.js';
 import {dialogCloseAsk} from '../shared/dialog.js';
+import {deepIsEqual}    from '../shared/generic.js';
 import srcBase64Icon    from '../shared/image.js';
 import {getCaption}     from '../shared/language.js';
 export {MyAdminLogin as default};
@@ -64,12 +65,12 @@ let MyAdminLogin = {
 			/>
 		</div>
 		
-		<div class="contentBox admin-login float" v-if="inputsReady">
+		<div class="contentBox admin-login float" v-if="ready">
 			<div class="top">
 				<div class="area nowrap">
-					<img class="icon" :src="getLoginIcon(active,admin,isLimited,noAuth)" />
-					<h1 class="title" v-if="!isNew && isLimited">{{ capApp.titleLimited.replace('{NAME}',name) }}</h1>
-					<h1 class="title" v-else>{{ isNew ? capApp.titleNew : capApp.title.replace('{NAME}',name) }}</h1>
+					<img class="icon" :src="getLoginIcon(inputs.active,inputs.admin,isLimited,inputs.noAuth)" />
+					<h1 class="title" v-if="!isNew && isLimited">{{ capApp.titleLimited.replace('{NAME}',inputs.name) }}</h1>
+					<h1 class="title" v-else>{{ isNew ? capApp.titleNew : capApp.title.replace('{NAME}',inputs.name) }}</h1>
 				</div>
 				<div class="area">
 					<my-button image="cancel.png"
@@ -88,13 +89,12 @@ let MyAdminLogin = {
 					<my-button image="refresh.png"
 						v-if="!isNew"
 						@trigger="get"
-						:active="hasChanges"
+						:active="isChanged"
 						:caption="capGen.button.refresh"
 					/>
 					<my-button image="add.png"
 						v-if="!isNew"
-						@trigger="reset"
-						:active="!isExtAuth"
+						@trigger="reset(false)"
 						:caption="capGen.button.new"
 					/>
 				</div>
@@ -102,7 +102,7 @@ let MyAdminLogin = {
 					<my-button image="warning.png"
 						v-if="!isNew"
 						@trigger="resetTotpAsk"
-						:active="!noAuth && !isOauth"
+						:active="!inputs.noAuth && !isOauth"
 						:cancel="true"
 						:caption="capApp.button.resetMfa"
 					/>
@@ -127,8 +127,8 @@ let MyAdminLogin = {
 							</td>
 							<td class="default-inputs">
 								<div class="column gap">
-									<input v-model="name" v-focus @keyup="typedUniqueField('name',name)" :disabled="isExtAuth" />
-									<div v-if="notUniqueName && name !== ''" class="message error">
+									<input v-model="inputs.name" v-focus @keyup="typedUniqueField('name',inputs.name)" :disabled="isExtAuth" />
+									<div v-if="notUniqueName && inputs.name !== ''" class="message error">
 										{{ capApp.dialog.notUniqueName }}
 									</div>
 								</div>
@@ -163,10 +163,10 @@ let MyAdminLogin = {
 								</div>
 							</td>
 							<td class="default-inputs">
-								<select v-if="isLdap" v-model="ldapId" disabled="disabled">
+								<select v-if="isLdap" v-model="inputs.ldapId" disabled="disabled">
 									<option :value="l.id" v-for="l in ldaps">{{ l.name }}</option>
 								</select>
-								<select v-if="isOauth" v-model="oauthClientId" disabled="disabled">
+								<select v-if="isOauth" v-model="inputs.oauthClientId" disabled="disabled">
 									<option :value="c.id" v-for="c in oauthClients">{{ c.name }}</option>
 								</select>
 							</td>
@@ -186,11 +186,11 @@ let MyAdminLogin = {
 
 						<!-- meta data -->
 						<template v-if="tabTarget === 'meta'">
-							<span v-if="isLdap"><b>{{ capApp.ldapMeta }}</b></span>
-							<span v-if="isOauth"><b>{{ capApp.oauthMeta }}</b></span>
+							<span class="login-details-content-message" v-if="isLdap"><b>{{ capApp.ldapMeta }}</b></span>
+							<span class="login-details-content-message" v-if="isOauth"><b>{{ capApp.oauthMeta }}</b></span>
 							<my-admin-login-meta
 								@input-in-unique-field="typedUniqueField"
-								v-model="meta"
+								v-model="inputs.meta"
 								:notUniqueEmail="notUniqueEmail"
 								:readonly="isExtAuth"
 							/>
@@ -236,9 +236,9 @@ let MyAdminLogin = {
 									</td>
 									
 									<!-- roles to toggle -->
-									<my-admin-login-role content="admin" @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="roleIds" />
-									<my-admin-login-role content="user"  @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="roleIds" />
-									<my-admin-login-role content="other" @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="roleIds" />
+									<my-admin-login-role content="admin" @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="inputs.roleIds" />
+									<my-admin-login-role content="user"  @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="inputs.roleIds" />
+									<my-admin-login-role content="other" @toggle="toggleRoleId($event)" :module="m" :readonly="isExtRole" :roleIds="inputs.roleIds" />
 								</tr>
 							</tbody>
 						</table>
@@ -253,7 +253,7 @@ let MyAdminLogin = {
 											<span>{{ capApp.admin }}</span>
 										</div>
 									</td>
-									<td><my-bool v-model="admin" /></td>
+									<td><my-bool v-model="inputs.admin" /></td>
 									<td>{{ capApp.hint.admin }}</td>
 								</tr>
 								
@@ -278,9 +278,9 @@ let MyAdminLogin = {
 													:nakedIcons="true"
 													:options="recordList"
 													:placeholder="capGen.threeDots"
-													:selected="records[lfi].id"
+													:selected="inputs.records[lfi].id"
 													:showOpen="true"
-													:inputTextSet="records[lfi].label"
+													:inputTextSet="inputs.records[lfi].label"
 												/>
 											</div>
 										</div>
@@ -295,7 +295,7 @@ let MyAdminLogin = {
 											<span>{{ capGen.active }}</span>
 										</div>
 									</td>
-									<td><my-bool v-model="active" /></td>
+									<td><my-bool v-model="inputs.active" /></td>
 									<td>{{ capApp.hint.active }}</td>
 								</tr>
 								<tr>
@@ -305,11 +305,11 @@ let MyAdminLogin = {
 											<span>{{ capApp.noAuth }}</span>
 										</div>
 									</td>
-									<td><my-bool v-model="noAuth" :readonly="isExtAuth" /></td>
+									<td><my-bool v-model="inputs.noAuth" :readonly="isExtAuth" /></td>
 									<td>
 										<div class="column gap default-inputs">
 											<span>{{ capApp.hint.noAuth }}</span>
-											<div class="row gap centered" v-if="noAuth">
+											<div class="row gap centered" v-if="inputs.noAuth">
 												<input disabled :value="noAuthUrl" />
 												<my-button image="copyClipboard.png"
 													@trigger="copyToClipboard"
@@ -327,7 +327,7 @@ let MyAdminLogin = {
 										</div>
 									</td>
 									<td class="default-inputs">
-										<input v-model="tokenExpiryHours" />
+										<input v-model="inputs.tokenExpiryHours" />
 									</td>
 									<td>{{ capApp.hint.tokenExpiryHours }}</td>
 								</tr>
@@ -341,7 +341,7 @@ let MyAdminLogin = {
 										</div>
 									</td>
 									<td class="default-inputs">
-										<input type="password" v-model="pass" :placeholder="capGen.threeDots" />
+										<input type="password" v-model="inputs.pass" :placeholder="capGen.threeDots" />
 									</td>
 									<td>{{ capApp.hint.password }}</td>
 								</tr>
@@ -365,40 +365,26 @@ let MyAdminLogin = {
 	</div>`,
 	props:{
 		ldaps:           { type:Array,  required:true },
-		loginId:         { type:Number, required:true }, // login ID from parent, 0 if new
+		loginId:         { type:Number, required:true }, // login ID to load, 0 if new
 		loginForms:      { type:Array,  required:true },
 		loginFormLookups:{ type:Array,  required:true },
 		oauthClients:    { type:Array,  required:true }
 	},
-	emits:['close'],
+	emits:['close','set-login-id'],
 	data() {
 		return {
-			// inputs
-			id:0,
-			ldapId:null,
-			oauthClientId:null,
-			active:true,
-			admin:false,
-			meta:{},
-			name:'',
-			noAuth:false,
-			pass:'',
-			tokenExpiryHours:'',
-			records:[],
-			roleIds:[],
-			templateId:null,
-			
 			// states
+			inputs:{},         // input values
+			inputsOrg:{},      // input values on load
 			notUniqueEmail:false,
 			notUniqueName:false,
-			inputKeys:['name','active','admin','pass','meta','noAuth','tokenExpiryHours','records','roleIds'],
-			inputsOrg:{},      // map of original input values, key = input key
-			inputsReady:false, // inputs have been loaded
+			ready:false,
 			recordInput:'',    // record lookup input
 			recordList:[],     // record lookup dropdown values
 			roleFilter:'',     // filter for role selection
 			tabTarget:'meta',
 			templates:[],      // login templates
+			templateId:null,   // login template, selected
 			timerNotUniqueCheck:null,
 			
 			// login form
@@ -408,19 +394,9 @@ let MyAdminLogin = {
 		};
 	},
 	computed:{
-		hasChanges:(s) => {
-			if(!s.inputsReady)
-				return false;
-			
-			for(let k of s.inputKeys) {
-				if(JSON.stringify(s.inputsOrg[k]) !== JSON.stringify(s[k]))
-					return true;
-			}
-			return false;
-		},
 		roleTotalNonHidden:(s) => {
 			let cnt = 0;
-			for(const roleId of s.roleIds) {
+			for(const roleId of s.inputs.roleIds) {
 				if(!s.moduleIdMapMeta[s.roleIdMap[roleId].moduleId].hidden)
 					cnt++
 			}
@@ -432,18 +408,19 @@ let MyAdminLogin = {
 		// simple states
 		anyAction: (s) => !s.isExtAuth,
 		anyInfo:   (s) => s.isLimited,
-		canSave:   (s) => s.hasChanges && !s.notUniqueName && s.name !== '',
+		canSave:   (s) => s.isChanged && !s.notUniqueName && s.inputs.name !== '',
+		isChanged: (s) => s.ready && !s.deepIsEqual(s.inputsOrg,s.inputs),
 		isExtAuth: (s) => s.isLdap || s.isOauth,
 		isExtRole: (s) => s.isLdapAssignedRoles || s.isOauthClientAssignedRoles,
 		isFormOpen:(s) => s.loginFormIndexOpen !== null,
-		isLdap:    (s) => s.ldapId !== null,
-		isLimited: (s) => s.activated && s.roleIds.length < 2 && !s.admin && !s.noAuth,
-		isNew:     (s) => s.id === 0,
-		isOauth:   (s) => s.oauthClientId !== null,
-		noAuthUrl: (s) => !s.noAuth ? '' : `${location.protocol}//${location.host}/#/?login=${s.name}`,
+		isLdap:    (s) => s.inputs.ldapId !== null,
+		isLimited: (s) => s.activated && s.inputs.roleIds.length < 2 && !s.inputs.admin && !s.inputs.noAuth,
+		isNew:     (s) => s.loginId === 0,
+		isOauth:   (s) => s.inputs.oauthClientId !== null,
+		noAuthUrl: (s) => !s.inputs.noAuth ? '' : `${location.protocol}//${location.host}/#/?login=${s.inputs.name}`,
 
-		isLdapAssignedRoles:       (s) => s.ldaps.filter(v => v.assignRoles && v.id === s.ldapId).length !== 0,
-		isOauthClientAssignedRoles:(s) => s.oauthClients.filter(v => v.claimRoles !== null && v.claimRoles !== '' && v.id === s.oauthClientId).length !== 0,
+		isLdapAssignedRoles:       (s) => s.ldaps.filter(v => v.assignRoles && v.id === s.inputs.ldapId).length !== 0,
+		isOauthClientAssignedRoles:(s) => s.oauthClients.filter(v => v.claimRoles !== null && v.claimRoles !== '' && v.id === s.inputs.oauthClientId).length !== 0,
 		
 		// stores
 		activated:      (s) => s.$store.getters['local/activated'],
@@ -457,24 +434,24 @@ let MyAdminLogin = {
 	},
 	mounted() {
 		window.addEventListener('keydown',this.handleHotkeys);
-		this.id = this.loginId;
-		this.getTemplates();
+		this.reset(true);
 		
-		// existing login, get values
-		if(this.id !== 0)
-			return this.get();
+		if(!this.isNew)
+			this.get();
 		
-		// new login, set defaults
-		for(let lf of this.loginForms) {
-			this.records.push({id:null,label:''});
+		if(this.isNew) {
+			// set defaults
+			for(let lf of this.loginForms) {
+				this.inputs.records.push({id:null,label:''});
+			}
 		}
-		this.inputsLoaded();
 	},
 	unmounted() {
 		window.removeEventListener('keydown',this.handleHotkeys);
 	},
 	methods:{
 		// externals
+		deepIsEqual,
 		dialogCloseAsk,
 		getCaption,
 		getLoginIcon,
@@ -492,16 +469,10 @@ let MyAdminLogin = {
 				e.preventDefault();
 			}
 		},
-		inputsLoaded() {
-			for(let k of this.inputKeys) {
-				this.inputsOrg[k] = JSON.parse(JSON.stringify(this[k]));
-			}
-			this.inputsReady = true;
-		},
 		
 		// actions
 		closeAsk() {
-			this.dialogCloseAsk(this.close,this.hasChanges);
+			this.dialogCloseAsk(this.close,this.isChanged);
 		},
 		close() {
 			this.$emit('close');
@@ -514,25 +485,47 @@ let MyAdminLogin = {
 			const mod = this.moduleIdMap[frm.moduleId];
 			
 			this.loginFormIndexOpen = index;
-			this.loginFormRecords   = this.records[index].id !== null
-				? [this.records[index].id] : [];
+			this.loginFormRecords   = this.inputs.records[index].id !== null
+				? [this.inputs.records[index].id] : [];
 		},
 		openLoginFormDropdown(index,state) {
 			const pos = this.loginFormIndexesDropdown.indexOf(index);
 			if(pos === -1 && state)  this.loginFormIndexesDropdown.push(index);
 			if(pos !== -1 && !state) this.loginFormIndexesDropdown.splice(pos,1);
 		},
-		reset() {
-			this.id             = 0;
-			this.name           = '';
+		reset(initNew) {
+			if(initNew) {
+				this.inputs = {
+					ldapId:null,
+					oauthClientId:null,
+					active:true,
+					admin:false,
+					meta:{},
+					name:'',
+					noAuth:false,
+					pass:'',
+					tokenExpiryHours:'',
+					records:[],
+					roleIds:[]
+				};
+			} else {
+				this.$emit('set-login-id',0);
+				this.inputs.ldapId        = null;
+				this.inputs.oauthClientId = null;
+				this.inputs.name          = '';
+				this.inputs.meta.email    = '';
+				this.getIsNotUnique('email',this.inputs.meta.email);
+			}
+			this.inputsOrg      = JSON.parse(JSON.stringify(this.inputs));
 			this.notUniqueEmail = false;
 			this.notUniqueName  = false;
-			this.getIsNotUnique('email',this.meta.email);
+			this.ready          = true;
+			this.getTemplates();
 		},
 		toggleRoleId(roleId) {
-			const pos = this.roleIds.indexOf(roleId);
-			if(pos === -1) this.roleIds.push(roleId);
-			else           this.roleIds.splice(pos,1);
+			const pos = this.inputs.roleIds.indexOf(roleId);
+			if(pos === -1) this.inputs.roleIds.push(roleId);
+			else           this.inputs.roleIds.splice(pos,1);
 		},
 		toggleRolesByContent(content) {
 			let roleIdsByContent = [];
@@ -546,17 +539,17 @@ let MyAdminLogin = {
 			}
 			
 			// has all roles, remove all
-			if(roleIdsByContent.length === this.roleIds.filter(v => roleIdsByContent.includes(v)).length) {
+			if(roleIdsByContent.length === this.inputs.roleIds.filter(v => roleIdsByContent.includes(v)).length) {
 				for(let i = 0, j = roleIdsByContent.length; i < j; i++) {
-					this.roleIds.splice(this.roleIds.indexOf(roleIdsByContent[i]),1);
+					this.inputs.roleIds.splice(this.inputs.roleIds.indexOf(roleIdsByContent[i]),1);
 				}
 				return;
 			}
 			
 			// does not have all roles, add missing
 			for(let i = 0, j = roleIdsByContent.length; i < j; i++) {
-				if(!this.roleIds.includes(roleIdsByContent[i]))
-					this.roleIds.push(roleIdsByContent[i]);
+				if(!this.inputs.roleIds.includes(roleIdsByContent[i]))
+					this.inputs.roleIds.push(roleIdsByContent[i]);
 			}
 		},
 		typedUniqueField(content,value) {
@@ -565,10 +558,10 @@ let MyAdminLogin = {
 		},
 		updateLoginRecord(loginFormIndex,recordId) {
 			this.recordInput = '';
-			this.records[loginFormIndex].id = recordId;
+			this.inputs.records[loginFormIndex].id = recordId;
 			
 			if(recordId !== null) this.getRecords(loginFormIndex);
-			else                  this.records[loginFormIndex].label = '';
+			else                  this.inputs.records[loginFormIndex].label = '';
 		},
 		
 		// backend calls
@@ -587,9 +580,9 @@ let MyAdminLogin = {
 			});
 		},
 		del() {
-			ws.send('login','del',{id:this.id},true).then(
+			ws.send('login','del',{id:this.loginId},true).then(
 				() => {
-					ws.send('login','kick',{id:this.id},true).then(
+					ws.send('login','kick',{id:this.loginId},true).then(
 						() => this.$emit('close'),
 						this.$root.genericError
 					);
@@ -599,7 +592,7 @@ let MyAdminLogin = {
 		},
 		get() {
 			ws.send('login','get',{
-				byId:this.id,
+				byId:this.loginId,
 				meta:true,
 				roles:true,
 				recordRequests:this.loginFormLookups
@@ -607,20 +600,9 @@ let MyAdminLogin = {
 				res => {
 					if(res.payload.logins.length !== 1) return;
 					
-					let login = res.payload.logins[0];
-					this.ldapId           = login.ldapId;
-					this.oauthClientId    = login.oauthClientId;
-					this.name             = login.name;
-					this.active           = login.active;
-					this.admin            = login.admin;
-					this.meta             = login.meta;
-					this.noAuth           = login.noAuth;
-					this.tokenExpiryHours = login.tokenExpiryHours;
-					this.records          = login.records;
-					this.roleIds          = login.roleIds;
-					this.pass             = '';
-					this.inputsLoaded();
-					this.getIsNotUnique('email',this.meta.email);
+					this.inputs    = res.payload.logins[0];
+					this.inputsOrg = JSON.parse(JSON.stringify(this.inputs));
+					this.getIsNotUnique('email',this.inputs.meta.email);
 				},
 				this.$root.genericError
 			);
@@ -631,13 +613,13 @@ let MyAdminLogin = {
 				return;
 
 			ws.send('login','getIsNotUnique',{
-				loginId:this.id,
+				loginId:this.loginId,
 				content:content,
 				value:value
 			},true).then(
 				res => {
 					switch(content) {
-						case 'email': this.notUniqueEmail = res.payload; break
+						case 'email': this.notUniqueEmail = res.payload; break;
 						case 'name':  this.notUniqueName  = res.payload; break;
 					}
 				},
@@ -646,11 +628,11 @@ let MyAdminLogin = {
 		},
 		getRecords(loginFormIndex) {
 			this.recordList = [];
-			let isIdLookup = this.records[loginFormIndex].id !== null;
+			let isIdLookup = this.inputs.records[loginFormIndex].id !== null;
 			
 			ws.send('login','getRecords',{
 				attributeIdLookup:this.loginForms[loginFormIndex].attributeIdLookup,
-				byId:isIdLookup ? this.records[loginFormIndex].id : 0,
+				byId:isIdLookup ? this.inputs.records[loginFormIndex].id : 0,
 				byString:isIdLookup ? '' : this.recordInput
 			},true).then(
 				res => {
@@ -658,7 +640,7 @@ let MyAdminLogin = {
 						return this.recordList = res.payload;
 					
 					if(res.payload.length === 1)
-						this.records[loginFormIndex].label = res.payload[0].name;
+						this.inputs.records[loginFormIndex].label = res.payload[0].name;
 				},
 				this.$root.genericError
 			);
@@ -680,32 +662,32 @@ let MyAdminLogin = {
 			for(let i = 0, j = this.loginForms.length; i < j; i++) {
 				records.push({
 					attributeId:this.loginForms[i].attributeIdLogin,
-					recordId:this.records[i].id
+					recordId:this.inputs.records[i].id
 				});
 			}
 			
 			ws.send('login','set',{
-				id:this.id,
-				name:this.name,
-				pass:this.pass,
-				active:this.active,
-				admin:this.admin,
-				meta:this.meta,
-				noAuth:this.noAuth,
-				tokenExpiryHours:/^(0|[1-9]\d*)$/.test(this.tokenExpiryHours) ? parseInt(this.tokenExpiryHours) : null,
-				roleIds:this.roleIds,
-				records:records,
-				templateId:this.templateId
+				id:this.loginId,
+				templateId:this.templateId,
+				name:this.inputs.name,
+				pass:this.inputs.pass,
+				active:this.inputs.active,
+				admin:this.inputs.admin,
+				meta:this.inputs.meta,
+				noAuth:this.inputs.noAuth,
+				tokenExpiryHours:/^(0|[1-9]\d*)$/.test(this.inputs.tokenExpiryHours) ? parseInt(this.inputs.tokenExpiryHours) : null,
+				roleIds:this.inputs.roleIds,
+				records:records
 			},true).then(
 				res => {
 					// if login was changed, reauth. or kick client
 					if(!this.isNew)
-						ws.send('login',this.active ? 'reauth' : 'kick',{id:this.id},false);
+						ws.send('login',this.inputs.active ? 'reauth' : 'kick',{id:this.loginId},false);
 					
 					if(this.isNew)
-						this.id = res.payload;
+						this.$emit('set-login-id',res.payload);
 					
-					this.get();
+					this.$nextTick(this.get);
 				},
 				this.$root.genericError
 			);
@@ -730,7 +712,7 @@ let MyAdminLogin = {
 			});
 		},
 		resetTotp() {
-			ws.send('login','resetTotp',{id:this.id},true).then(
+			ws.send('login','resetTotp',{id:this.loginId},true).then(
 				res => {},this.$root.genericError
 			);
 		}
diff --git a/www/comps/admin/adminLogins.js b/www/comps/admin/adminLogins.js
index fc1b47a8..7c1da970 100644
--- a/www/comps/admin/adminLogins.js
+++ b/www/comps/admin/adminLogins.js
@@ -99,6 +99,7 @@ let MyAdminLogins = {
 			<my-admin-login
 				v-if="loginIdOpen !== null"
 				@close="loginIdOpen = null;get()"
+				@set-login-id="loginIdOpen = $event"
 				:ldaps="ldaps"
 				:loginId="loginIdOpen"
 				:loginForms="loginForms"
diff --git a/www/comps/admin/adminOauthClients.js b/www/comps/admin/adminOauthClients.js
index f7e10a7a..4859aa1f 100644
--- a/www/comps/admin/adminOauthClients.js
+++ b/www/comps/admin/adminOauthClients.js
@@ -29,14 +29,14 @@ let MyAdminOauthClients = {
 		<div class="content grow">
 			<div class="generic-entry-list wide">
 				<div class="entry clickable"
-					v-for="(e,k) in oauthClientIdMap"
-					@click="idOpen = e.id"
-					:key="e.id"
-					:title="e.name"
+					v-for="(c,k) in oauthClientIdMap"
+					@click="idOpen = c.id"
+					:key="c.id"
+					:title="c.name"
 				>
 					<div class="lines">
-						<span>{{ e.name }}</span>
-						<span class="subtitle">{{ capApp.dateExpiry + ': ' + getUnixFormat(e.dateExpiry,settings.dateFormat) }}</span>
+						<span>{{ c.name }}</span>
+						<span class="subtitle">{{ subtitle(c) }}</span>
 					</div>
 				</div>
 			</div>
@@ -76,6 +76,16 @@ let MyAdminOauthClients = {
 	methods:{
 		// externals
 		getUnixFormat,
+
+		// presentation
+		subtitle(c) {
+			let parts = [`${this.capApp.option.flow[c.flow]}`];
+			
+			if(c.dateExpiry !== null)
+				parts.push(`${this.capApp.dateExpiry}: ${getUnixFormat(c.dateExpiry,this.settings.dateFormat)}`);
+
+			return parts.join(', ');
+		},
 		
 		// backend calls
 		get() {
diff --git a/www/langs/ar_eg b/www/langs/ar_eg
index 3b1b5d8f..a2f8574a 100644
--- a/www/langs/ar_eg
+++ b/www/langs/ar_eg
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "هل أنت متأكد أنك تريد حذف تسجيل الدخول هذا؟<br /><br />هذا الإجراء لا رجعة فيه.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "سيؤدي هذا إلى إعادة تعيين كافة أساليب المصادقة متعددة العوامل (MFA) لتسجيل الدخول هذا. <br /><br />ليس لإعادة ضبط MFA أي تأثير على التشفير الشامل.<br /><br />هل تريد الاستمرار؟"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/de_de b/www/langs/de_de
index f38df7cd..1c5107c0 100644
--- a/www/langs/de_de
+++ b/www/langs/de_de
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Bist du sicher, dass du diesen Benutzer löschen möchtest?<br /><br />Diese Aktion ist nicht umkehrbar.</b>",
-				"notUniqueEmail": "Die gleiche Email-Adresse wurde bereits einem anderen Benutzer zugewiesen.",
 				"notUniqueName": "Der gleiche Benutzername wurde bereits einem anderen Benutzer zugewiesen.",
 				"resetTotp": "Hiermit werden alle Multi-Faktor-Authentifizierungsmethoden (MFA) für diesen Benutzer zurückgesetzt. Systemzugriff ist dann mit nur Benutzername & Passwort möglich.<br /><br />Zurücksetzung der MFA hat keinen Einfluss auf die Ende-zu-Ende-Verschlüsselung.<br /><br />Möchten Sie fortfahren?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Abteilung",
+			"dialog": {
+				"notUniqueEmail": "Die gleiche Email-Adresse wurde bereits einem anderen Benutzer zugewiesen."
+			},
 			"email": "E-Mail",
 			"location": "Standort",
 			"nameDisplay": "Anzeigename",
diff --git a/www/langs/en_us b/www/langs/en_us
index ef1da1ce..388b6494 100644
--- a/www/langs/en_us
+++ b/www/langs/en_us
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -265,6 +264,9 @@
 			"tokenExpiryHours": "Max. session time in hours"
 		},
 		"loginMeta": {
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"department": "Department",
 			"email": "Email",
 			"location": "Location",
diff --git a/www/langs/es_es b/www/langs/es_es
index d0256687..16002c41 100644
--- a/www/langs/es_es
+++ b/www/langs/es_es
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "¿Estás seguro de que deseas eliminar este usuario?<br /><br />Esta acción es irreversible.</b>",
-				"notUniqueEmail": "La misma dirección de correo electrónico también ha sido asignada a un usuario diferente.",
 				"notUniqueName": "El mismo nombre de usuario ya ha sido asignado a un usuario diferente.",
 				"resetTotp": "Esto restablecerá todos los métodos de autenticación multifactor (MFA) para este usuario. El acceso al sistema será posible solo con nombre de usuario y contraseña.<br /><br />Restablecer MFA no afecta el cifrado de extremo a extremo.<br /><br />¿Deseas continuar?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "La misma dirección de correo electrónico también ha sido asignada a un usuario diferente."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/fr_fr b/www/langs/fr_fr
index 98b22dfb..e09f5408 100644
--- a/www/langs/fr_fr
+++ b/www/langs/fr_fr
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Êtes-vous sûr de vouloir supprimer cet utilisateur?<br /><br />Cette action est irréversible.",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "Cela réinitialisera toutes les méthodes d'authentification multi-facteurs (MFA) pour cet utilisateur. L'accès au système sera ensuite possible uniquement avec le nom d'utilisateur et le mot de passe.<br /><br />La réinitialisation du MFA n'affecte pas le chiffrement de bout en bout.<br /><br />Voulez-vous continuer ?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/hu_hu b/www/langs/hu_hu
index 00de2751..0fce98c5 100644
--- a/www/langs/hu_hu
+++ b/www/langs/hu_hu
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/it_it b/www/langs/it_it
index 16fb49c2..5124ff2c 100644
--- a/www/langs/it_it
+++ b/www/langs/it_it
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/lv_lv b/www/langs/lv_lv
index e1141d63..addae495 100644
--- a/www/langs/lv_lv
+++ b/www/langs/lv_lv
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/ro_ro b/www/langs/ro_ro
index 587b6ff2..65850355 100644
--- a/www/langs/ro_ro
+++ b/www/langs/ro_ro
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",
diff --git a/www/langs/zh_cn b/www/langs/zh_cn
index a1fd07da..fce32cb1 100644
--- a/www/langs/zh_cn
+++ b/www/langs/zh_cn
@@ -221,7 +221,6 @@
 			},
 			"dialog": {
 				"delete": "Are you sure you want to delete this user?<br /><br />This action is irreversible.</b>",
-				"notUniqueEmail": "The same email address has also been assigned to a different user.",
 				"notUniqueName": "The same username has already been assigned to a different user.",
 				"resetTotp": "This will reset all multi-factor authentication (MFA) methods for this user. System access is then possible with only username & password.<br /><br />Resetting MFA has no effect on end-to-end encryption.<br /><br />Do you want to continue?"
 			},
@@ -266,6 +265,9 @@
 		},
 		"loginMeta": {
 			"department": "Department",
+			"dialog": {
+				"notUniqueEmail": "The same email address has also been assigned to a different user."
+			},
 			"email": "Email",
 			"location": "Location",
 			"nameDisplay": "Display name",