diff --git a/templates/user/list.html.twig b/templates/user/list.html.twig
index 8c29d180..5f1c0d10 100644
--- a/templates/user/list.html.twig
+++ b/templates/user/list.html.twig
@@ -122,10 +122,10 @@
 						sortable: false,
 						overflow: 'visible',
 						template: function (row, index, datatable) {
-							var actions = '<a href="' + row.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.id + '" title="Edit"><i class="la la-edit"></i></a>';
+							var actions = '<a href="' + row.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.username + '" title="Edit"><i class="la la-edit"></i></a>';
 
 							if (row.id != 'ROLE_SUPER_ADMIN') {
-								actions += '<a href="' + row.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
+								actions += '<a href="' + row.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.username + '" title="Delete"><i class="la la-trash"></i></a>';
 							}
 							
 							return actions;
@@ -150,7 +150,7 @@
 
 				swal({
 					title: 'Confirmation',
-					text: 'Are you sure you want to delete ' + id + '?',
+					html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
 					type: 'warning',
 					showCancelButton: true
 				}).then((result) => {