diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 894744ba3e951682724bca92bb5551457d99bc72..9cbe7cd514d09712a780a2ba32b14ed2a5b6057f 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -163,7 +163,7 @@ DeleteHandler.prototype.delete = function() {
 				dh.removeCallback(dh.oidToDelete);
 				dh.canceled = true;
 			} else {
-				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete)));
+				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete {objName}', {objName: escapeHTML(dh.oidToDelete)}));
 				dh.undoCallback(dh.oidToDelete);
 			}
 		}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 0ff8bdd638419896805cc8a07b065846a12f26ba..dcaf593b886035fb677d7e381292070d71836486 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -202,8 +202,8 @@ GroupList = {
 
 		//configure undo
 		OC.Notification.hide();
-		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			t('settings', 'undo') + '</span>';
+		var msg = escapeHTML(t('settings', 'deleted {groupName}', {groupName: '%oid'})) + '<span class="undo">' +
+			escapeHTML(t('settings', 'undo')) + '</span>';
 		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
 			GroupList.show);
 
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 68098e03a50b11b750daec3d4945d6a52c670e0e..a911225c5c5c5c85add8a44878bae8d178558136 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -251,8 +251,8 @@ var UserList = {
 
 		//configure undo
 		OC.Notification.hide();
-		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
-			t('settings', 'undo') + '</span>';
+		var msg = escapeHTML(t('settings', 'deleted {userName}', {userName: '%oid'})) + '<span class="undo">' +
+			escapeHTML(t('settings', 'undo')) + '</span>';
 		UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
 										UserList.show);