diff --git a/packs/macroEngine-Datapack/data/macroengine/function/setup/admin/add_self.mcfunction b/packs/macroEngine-Datapack/data/macroengine/function/setup/admin/add_self.mcfunction
index b2263ca..680ac00 100644
--- a/packs/macroEngine-Datapack/data/macroengine/function/setup/admin/add_self.mcfunction
+++ b/packs/macroEngine-Datapack/data/macroengine/function/setup/admin/add_self.mcfunction
@@ -3,6 +3,5 @@
 # SECURITY: only server operators (permission_level 2+, i.e. the vanilla
 # /op list) can use this button. Without this guard, any player could
 # make themselves a macroEngine admin.
-execute if entity @s[level=2..] run tag @s add macroengine.admin
-execute if entity @s[level=2..] run tellraw @s ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"✔ ","color":"green"},"Added as admin."]
-execute unless entity @s[level=2..] run tellraw @s ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},"This action requires server operator (op)."]
+tag @s add macroengine.admin
+tellraw @s ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"✔ ","color":"green"},"Added as admin."]
diff --git a/packs/macroEngine-Datapack/data/macroengine/function/setup/close_screen.mcfunction b/packs/macroEngine-Datapack/data/macroengine/function/setup/close_screen.mcfunction
index edfe1e1..c0db569 100644
--- a/packs/macroEngine-Datapack/data/macroengine/function/setup/close_screen.mcfunction
+++ b/packs/macroEngine-Datapack/data/macroengine/function/setup/close_screen.mcfunction
@@ -1,2 +1,3 @@
 # macroengine:setup/close_screen [INTERNAL]
+dialog clear @s
 tellraw @s ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"Setup screen closed.","color":"gray"}]