diff --git a/lib/setup.php b/lib/setup.php
index 911fb8d8b50..adca64b9ac1 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -162,17 +162,19 @@
 
     class object {};
     
-    session_name('MoodleSession');
-    @session_start();
-    if (! isset($_SESSION['SESSION'])) { 
-        $_SESSION['SESSION'] = new object; 
+    if (!isset($nomoodlecookie)) {
+        session_name('MoodleSession');
+        @session_start();
+        if (! isset($_SESSION['SESSION'])) { 
+            $_SESSION['SESSION'] = new object; 
+        }
+        if (! isset($_SESSION['USER']))    { 
+            $_SESSION['USER']    = new object; 
+        }
+    
+        $SESSION = &$_SESSION['SESSION'];   // Makes them easier to reference
+        $USER    = &$_SESSION['USER'];
     }
-    if (! isset($_SESSION['USER']))    { 
-        $_SESSION['USER']    = new object; 
-    }
-
-    $SESSION = &$_SESSION['SESSION'];   // Makes them easier to reference
-    $USER    = &$_SESSION['USER'];
 
     if (isset($FULLME)) {
         $ME = $FULLME;
diff --git a/user/pix.php b/user/pix.php
index 073ba4c6e98..97921489386 100644
--- a/user/pix.php
+++ b/user/pix.php
@@ -3,6 +3,8 @@
       // Syntax:   pix.php/userid/f1.jpg or pix.php/userid/f2.jpg
       //     OR:   ?file=userid/f1.jpg or ?file=userid/f2.jpg
 
+    $nomoodlecookie = true;     // Because it interferes with caching
+
     require_once("../config.php");
 
     $lifetime = 86400;