diff --git a/secure/explorationmaster.c b/secure/explorationmaster.c
index f8dba4b..8ca09d6 100644
--- a/secure/explorationmaster.c
+++ b/secure/explorationmaster.c
@@ -103,8 +103,7 @@
       || ({<int|string>})pldata->QueryProp(P_TESTPLAYER))
     return;
   // Wenn kein SPieler/Seher, sondern Magier: auch ueberspringen
-  mixed* uinfo = ({mixed*})master()->get_userinfo(pl);
-  if (uinfo[USER_LEVEL+1] >= LEARNER_LVL)
+  if (IS_LEARNER(pl))
     return;
 
   string eps=({string})master()->query_ep(pl) || "";
diff --git a/secure/playerdata.c b/secure/playerdata.c
index d01e9bb..37f7c94 100644
--- a/secure/playerdata.c
+++ b/secure/playerdata.c
@@ -47,9 +47,9 @@
   if (query_wiz_level(getuid(previous_object())) < WIZARD_LVL)
     return 0;
 
-  mixed userinfo=MASTER->get_userinfo(name);
-  if (!pointerp(userinfo))
+  if (!master()->find_userinfo(name))
     return 0;
+
   // Wenn es das Spielerobjekt gibt, ist alles gut, dann fragen wir einfach
   // das.
   pl = find_player(name) || find_netdead(name);