diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 9085daa34c0..13429501a00 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2540,7 +2540,7 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007100903);
     }
     
-    if ($result && $oldversion < 2007101500) {
+    if ($result && $oldversion < 2007101500 && !file_exists($CFG->dataroot . '/user')) {
         // Get list of users by browsing moodledata/user
         $oldusersdir = $CFG->dataroot . '/users';
         $folders = get_directory_list($oldusersdir, '', false, true, false);