diff --git a/frontend/src/components/Settings/BadgeAssignments.vue b/frontend/src/components/Settings/BadgeAssignments.vue
index 5850f210..663d5214 100644
--- a/frontend/src/components/Settings/BadgeAssignments.vue
+++ b/frontend/src/components/Settings/BadgeAssignments.vue
@@ -179,13 +179,13 @@ const columns = computed(() => {
 			label: __('Member'),
 			key: 'member_name',
 			icon: 'user',
-			width: '80%',
+			width: '60%',
 		},
 		{
 			label: __('Issued On'),
 			key: 'issued_on',
 			icon: 'calendar',
-			align: 'right',
+			align: 'center',
 		},
 	]
 })
diff --git a/frontend/src/components/Settings/BadgeForm.vue b/frontend/src/components/Settings/BadgeForm.vue
index a7d65492..75d2cc8b 100644
--- a/frontend/src/components/Settings/BadgeForm.vue
+++ b/frontend/src/components/Settings/BadgeForm.vue
@@ -159,13 +159,11 @@ const setValue = (close: () => void) => {
 			onSuccess() {
 				badges.value?.reload()
 				close()
-				toast.success(__('Zoom Account updated successfully'))
+				toast.success(__('Badge updated successfully'))
 			},
 			onError(err: any) {
 				close()
-				toast.error(
-					cleanError(err.messages[0]) || __('Error updating Zoom Account')
-				)
+				toast.error(cleanError(err.messages[0]) || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Settings/Badges.vue b/frontend/src/components/Settings/Badges.vue
index 1edce46b..f28249e0 100644
--- a/frontend/src/components/Settings/Badges.vue
+++ b/frontend/src/components/Settings/Badges.vue
@@ -34,7 +34,7 @@
 				<ListHeader
 					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
 				>
-					<ListHeaderItem :item="item" v-for="item in columns">
+					<ListHeaderItem :item="item" v-for="item in columns" :key="item.key">
 						<template #prefix="{ item }">
 							<FeatherIcon
 								v-if="item.icon"
@@ -45,7 +45,7 @@
 					</ListHeaderItem>
 				</ListHeader>
 				<ListRows>
-					<ListRow :row="row" v-for="row in badges.data">
+					<ListRow :row="row" v-for="row in badges.data" :key="row.name">
 						<template #default="{ column, item }">
 							<ListRowItem :item="row[column.key]" :align="column.align">
 								<div v-if="column.key == 'enabled'">