diff --git a/gui/app/components/customize/user-list.js b/gui/app/components/customize/user-list.js
index 3cdf861b..0803ecb7 100644
--- a/gui/app/components/customize/user-list.js
+++ b/gui/app/components/customize/user-list.js
@@ -202,6 +202,11 @@ export default Component.extend(AuthProvider, ModalMixin, {
 			let group = this.get('groups').findBy('id', groupId);
 			group.set('isMember', false);
 
+			if (is.undefined(groupId) || is.undefined(userId)) {
+				console.log(groupId, userId);
+				return;
+			}
+
 			this.get('groupSvc').leave(groupId, userId).then(() => {
 				this.filterUsers();
 			});			
@@ -212,6 +217,11 @@ export default Component.extend(AuthProvider, ModalMixin, {
 			let group = this.get('groups').findBy('id', groupId);
 			group.set('isMember', true);
 
+			if (is.undefined(groupId) || is.undefined(userId)) {
+				console.log(groupId, userId);
+				return;
+			}
+
 			this.get('groupSvc').join(groupId, userId).then(() => {
 				this.filterUsers();
 			});			
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs
index b92fd0a6..cc796be2 100644
--- a/gui/app/templates/components/customize/user-list.hbs
+++ b/gui/app/templates/components/customize/user-list.hbs
@@ -97,7 +97,11 @@
 						{{/if}}
 					</td>
 					<td class="no-width text-center">
+						<div class="user-button-{{user.id}} button-icon-gray button-icon-small" title="Edit" {{action "onShowEdit" user.id}}>
+							<i class="material-icons">mode_edit</i>
+						</div>
 						{{#unless user.me}}
+							<div class="button-icon-gap" />
 							<div class="delete-button-{{user.id}} button-icon-red button-icon-small" title="Delete" {{action "onShowDelete" user.id}}>
 								<i class="material-icons">delete</i>
 							</div>
@@ -132,15 +136,15 @@
 							<div class="col-md-6">
 								<div class="form-group">
 									<label for="edit-password">Password</label>
-									<div class="tip">Optional new password</div>
 									{{input id="edit-password" type="password" class="form-control" value=password.password}}
+									<small class="form-text text-muted">Optional new password</small>
 								</div>
 							</div>
 							<div class="col-md-6">
 								<div class="form-group">
 									<label for="edit-confirmPassword">Confirm Password</label>
-									<div class="tip">Confirm new password</div>
 									{{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}}
+									<small class="form-text text-muted">Confirm new password</small>
 								</div>
 							</div>
 						</div>
diff --git a/gui/app/templates/components/section/gemini/type-editor.hbs b/gui/app/templates/components/section/gemini/type-editor.hbs
index db9c75a9..7df0865f 100644
--- a/gui/app/templates/components/section/gemini/type-editor.hbs
+++ b/gui/app/templates/components/section/gemini/type-editor.hbs
@@ -9,8 +9,8 @@
 		</div>
 		<div class="form-group">
 			<label>Username</label>
-			<div class="tip">Gemini Username</div>
 			{{input id="gemini-username" type="text" value=config.username class="form-control"}}
+			<small class="form-text text-muted">Gemini Username</small>
 		</div>
 		<div class="form-group">
 			<label for="gemini-apikey">API Key</label>