diff --git a/mirricraft-npc.sk b/mirricraft-npc.sk
index d386690..80832ed 100644
--- a/mirricraft-npc.sk
+++ b/mirricraft-npc.sk
@@ -1,10 +1,11 @@
 # --- NPC ---
 on rightclick on entity:
     if clicked entity is a citizen:
-        if name of npc is "Robotti825":
-            if player doesn't have the permission "group.jasen":
-                message "&7[&2Robotti825&7]&r Annoin sinulle jäsenroolin, muistathan käyttäytyä!"
-                if player doesn't have the permission "group.aikainenjasen":
-                    make console execute command "/lp user %player% group add jasen"
-            else:
-                message "&7[&2Robotti825&7]&r Olet jo jäsen"
\ No newline at end of file
+        if player's world is "lobby":
+            if name of clicked entity is "Robotti825":
+                if player doesn't have the permission "group.jasen":
+                    message "&7[&r%name of clicked entity%&7]&r Annoin sinulle jäsenroolin, muistathan käyttäytyä!" to player
+                    if player doesn't have the permission "group.aikainenjasen":
+                        make console execute command "/lp user %player% group add jasen"
+                else:
+                    message "&7[&r%name of clicked entity%&7]&r Olet jo jäsen" to player
\ No newline at end of file