diff --git a/lib/setup.php b/lib/setup.php
index 13ce9c9cae2..0de454fc43f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -211,8 +211,9 @@
         $USER    = &$_SESSION['USER'];
     }
 
-    if (isset($FULLME)) {
-        $ME = $FULLME;
+    if (defined('FULLME')) {     // Usually in command-line scripts like admin/cron.php
+        $FULLME = FULLME;
+        $ME = FULLME;
     } else {
         $FULLME = qualified_me();
         $ME = strip_querystring($FULLME);