diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index 72af3814..090defb1 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -106,7 +106,7 @@ export default {
 		listRoutePrefix() {
 			let name = 'list'
 
-			if (this.$route.name.startsWith('list.')) {
+			if (this.$route.name !== null && this.$route.name.startsWith('list.')) {
 				name = this.$route.name
 			}
 
diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index 874e5ef0..38d0e82d 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -67,12 +67,12 @@
 					</div>
 				</div>
 				<div class="field">
-					<label class="label" for="currentPassword">Current Password</label>
+					<label class="label" for="currentPasswordEmail">Current Password</label>
 					<div class="control">
 						<input
 							@keyup.enter="updateEmail"
 							class="input"
-							id="currentPassword"
+							id="currentPasswordEmail"
 							placeholder="Your current password"
 							type="password"
 							v-model="emailUpdate.password"/>