diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 276c3cd5e73..b1f71f80ebc 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -624,7 +624,7 @@ function xmldb_main_upgrade($oldversion=0) {
 
     if (!empty($CFG->rolesactive) && $result && $oldversion < 2007021401) {
     /// create default logged in user role if not present - upgrade rom 1.7.x
-        if (empty($CFG->defaultuserroleid) or $CFG->defaultuserroleid == $CFG->guestroleid) {
+        if (empty($CFG->defaultuserroleid) or empty($CFG->guestroleid) or $CFG->defaultuserroleid == $CFG->guestroleid) {
             if (!get_records('role', 'shortname', 'user')) {
                 $userroleid = create_role(addslashes(get_string('authenticateduser')), 'user',
                                           addslashes(get_string('authenticateduserdescription')), 'moodle/legacy:user');