diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 3a26d1e184..72e85e4b6b 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -11,7 +11,6 @@ PREP(addCanInteractWithCondition);
 PREP(addLineToDebugDraw);
 PREP(addSetting);
 PREP(addToInventory);
-PREP(adminKick);
 PREP(ambientBrightness);
 PREP(applyForceWalkStatus);
 PREP(ASLToPosition);
diff --git a/addons/common/functions/fnc_adminKick.sqf b/addons/common/functions/fnc_adminKick.sqf
deleted file mode 100644
index bc9afd9fcb..0000000000
--- a/addons/common/functions/fnc_adminKick.sqf
+++ /dev/null
@@ -1,8 +0,0 @@
-// by commy2
-#include "script_component.hpp"
-
-private "_name";
-
-_name = name (_this select 0);
-
-[_name, "{if (serverCommandAvailable '#kick') then {serverCommand format['#kick %1', _this]}}"] call FUNC(execRemoteFnc);
diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf
index f239074b0b..4733f1a81f 100644
--- a/addons/common/functions/fnc_checkPBOs.sqf
+++ b/addons/common/functions/fnc_checkPBOs.sqf
@@ -67,24 +67,26 @@ if (!isServer) then {
             //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
             diag_log text _error;
 
-            _text = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _text]];
+            if (_mode < 2) then {
+                _text = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _text]];
 
-            _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer;
-            _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true];
+                _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer;
+                _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true];
 
-            disableSerialization;
-            _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint";
-            _ctrlHint ctrlSetStructuredText _text;
+                disableSerialization;
+                _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint";
+                _ctrlHint ctrlSetStructuredText _text;
 
-            if (_mode == 0) then {
-                sleep 10;
-                _rscLayer cutFadeOut 0.2;
+                if (_mode == 0) then {
+                    sleep 10;
+                    _rscLayer cutFadeOut 0.2;
+                };
             };
 
             if (_mode == 2) then {
-                sleep 10;
-                waitUntil {alive player};
-                [player] call FUNC(adminKick);
+                waitUntil {alive player}; // To be able to show list if using checkAll
+                _text = composeText [parseText format ["<t align='center'>%1</t>", _text]];
+                ["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
             };
         };
     };