diff --git a/public/src/admin/manage/admins-mods.js b/public/src/admin/manage/admins-mods.js
index ab873b7251..634436fd12 100644
--- a/public/src/admin/manage/admins-mods.js
+++ b/public/src/admin/manage/admins-mods.js
@@ -11,7 +11,7 @@ define('admin/manage/admins-mods', [
 				if (err) {
 					return alerts.error(err);
 				}
-				alerts.success('[[admin/manage/users:alerts.make-admin-success]]');
+
 				$('#admin-search').val('');
 
 				if ($('.administrator-area [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -36,7 +36,6 @@ define('admin/manage/admins-mods', [
 						if (err) {
 							return alerts.error(err.message);
 						}
-						alerts.success('[[admin/manage/users:alerts.remove-admin-success]]');
 						userCard.remove();
 					});
 				}
@@ -45,7 +44,6 @@ define('admin/manage/admins-mods', [
 
 		autocomplete.user($('#global-mod-search'), function (ev, ui) {
 			api.put('/groups/global-moderators/membership/' + ui.item.user.uid).then(() => {
-				alerts.success('[[admin/manage/users:alerts.make-global-mod-success]]');
 				$('#global-mod-search').val('');
 
 				if ($('.global-moderator-area [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -66,7 +64,6 @@ define('admin/manage/admins-mods', [
 			bootbox.confirm('[[admin/manage/users:alerts.confirm-remove-global-mod]]', function (confirm) {
 				if (confirm) {
 					api.del('/groups/global-moderators/membership/' + uid).then(() => {
-						alerts.success('[[admin/manage/users:alerts.remove-global-mod-success]]');
 						userCard.remove();
 						if (!$('.global-moderator-area').children().length) {
 							$('#no-global-mods-warning').removeClass('hidden');
@@ -92,7 +89,7 @@ define('admin/manage/admins-mods', [
 				if (err) {
 					return alerts.error(err);
 				}
-				alerts.success('[[admin/manage/users:alerts.make-moderator-success]]');
+
 				input.val('');
 
 				if ($('.moderator-area[data-cid="' + cid + '"] [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -118,7 +115,7 @@ define('admin/manage/admins-mods', [
 						if (err) {
 							return alerts.error(err);
 						}
-						alerts.success('[[admin/manage/users:alerts.remove-moderator-success]]');
+
 						userCard.remove();
 						if (!moderatorArea.children().length) {
 							$('.no-moderator-warning[data-cid="' + cid + '"]').removeClass('hidden');
diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index 1556720d40..08a74d3d2f 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -10,7 +10,7 @@
 			<h4 class="mb-0">[[admin/manage/admins-mods:administrators]]</h4>
 			<input id="admin-search" class="form-control form-control-sm w-auto" placeholder="[[admin/manage/admins-mods:add-administrator]]" />
 		</div>
-		<div class="administrator-area">
+		<div class="administrator-area d-flex flex-wrap">
 		{{{ each admins.members }}}
 			<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{admins.members.uid}">
 				{buildAvatar(admins.members, "24px", true)}
@@ -30,7 +30,7 @@
 			<h4 class="mb-0">[[admin/manage/admins-mods:global-moderators]]</h4>
 			<input id="global-mod-search" class="form-control form-control-sm w-auto" placeholder="[[admin/manage/admins-mods:add-global-moderator]]" />
 		</div>
-		<div class="global-moderator-area mb-2">
+		<div class="global-moderator-area mb-2 d-flex flex-wrap">
 		{{{ each globalMods.members }}}
 			<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{globalMods.members.uid}">
 				{buildAvatar(globalMods.members, "24px", true)}
@@ -82,15 +82,15 @@
 
 
 
-			<div class="moderator-area" data-cid="{categoryMods.cid}">
+			<div class="moderator-area d-flex flex-wrap" data-cid="{categoryMods.cid}">
 				{{{ each categoryMods.moderators }}}
-					<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{categoryMods.moderators.uid}">
-						{buildAvatar(categoryMods.moderators, "24px", true)}
-						<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a>
-						<button class="btn-ghost-sm p-0 remove-user-icon">
-							<i class="fa fa-fw fa-times" role="button"></i>
-						</button>
-					</div>
+				<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{categoryMods.moderators.uid}">
+					{buildAvatar(categoryMods.moderators, "24px", true)}
+					<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a>
+					<button class="btn-ghost-sm p-0 remove-user-icon">
+						<i class="fa fa-fw fa-times" role="button"></i>
+					</button>
+				</div>
 				{{{ end }}}
 			</div>