diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0a67da57191..2bb5865dd52 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -130,7 +130,8 @@ function load_defaultuser_role() {
     if ($capabilities = get_records_select('role_capabilities',
                                      "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id")) {
         foreach ($capabilities as $capability) {
-            if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) {  // Don't overwrite
+            if (!isset($USER->capabilities[$sitecontext->id][$capability->capability]) 
+                && $capability->permission != 0) {  // Don't overwrite if it's already set, nor store 'inherit'
                 $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;
             }
         }