diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
index 9c66ae1ee..18f33c785 100644
--- a/addons/main/script_macros_common.hpp
+++ b/addons/main/script_macros_common.hpp
@@ -1752,7 +1752,8 @@ Macro: IS_ADMIN
 Author:
     commy2
 ------------------------------------------- */
-#define IS_ADMIN serverCommandAvailable '#kick'
+#define IS_ADMIN_SYS(x) x##kick
+#define IS_ADMIN serverCommandAvailable 'IS_ADMIN_SYS(#)'
 
 /* -------------------------------------------
 Macro: IS_ADMIN_LOGGED
@@ -1772,7 +1773,8 @@ Macro: IS_ADMIN_LOGGED
 Author:
     commy2
 ------------------------------------------- */
-#define IS_ADMIN_LOGGED serverCommandAvailable '#shutdown'
+#define IS_ADMIN_LOGGED_SYS(x) x##shutdown
+#define IS_ADMIN_LOGGED serverCommandAvailable 'IS_ADMIN_LOGGED_SYS(#)'
 
 /* -------------------------------------------
 Macro: FILE_EXISTS