diff --git a/userpix/index.php b/userpix/index.php
index 90762aa7dab..a744cfb5674 100644
--- a/userpix/index.php
+++ b/userpix/index.php
@@ -25,11 +25,17 @@
     print_header($title, $title, $title);
     
     foreach ($users as $user) {
-       echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=1\"".
-            "title=\"".fullname($user)."\">";
-       echo "<img border=0 src=\"$CFG->wwwroot/user/pix.php/$user->id/f1.jpg\" ".
-            "width=100 height=100 alt=\"".fullname($user)."\" />";
-       echo "</a> \n";
+        $fullname = fullname($user);
+        echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=1\"".
+             "title=\"$fullname\">";
+        if ($CFG->slasharguments) {        // Use this method if possible for better caching
+            echo '<img src="'. $CFG->wwwroot .'/user/pix.php/'.$user->id.'/f1.jpg"'.
+                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+        } else {
+            echo '<img src="'. $CFG->wwwroot .'/user/pix.php?file=/'. $user->id .'/f1.jpg"'.
+                 ' border="0" width="100" height="100" alt="'.$fullname.'" />';
+        }
+        echo "</a> \n";
     }
     
     print_footer();