Index: /branches/release-40/lib/MT/Upgrade.pm
===================================================================
--- /branches/release-40/lib/MT/Upgrade.pm (revision 2623)
+++ /branches/release-40/lib/MT/Upgrade.pm (revision 2627)
@@ -956,9 +956,24 @@
                 label => 'Assigning all permissions to blog administrator...',
                 condition => sub {
-                    $_[0]->can_administer_blog;
+                    $_[0]->can_administer_blog && $_[0]->blog_id;
                 },
                 code => sub {
                     my ($perm) = shift;
                     $perm->set_full_permissions;
+                },
+            },
+        },
+        'core_recover_sysadmin_permissions' => {
+            version_limit => 4.0067,
+            priority => 3.5,
+            updater => {
+                type => 'permission',
+                label => 'Recover permissions of system administrators...',
+                condition => sub {
+                    !$_[0]->blog_id && !$_[0]->has('administer') && $_[0]->can_administer_blog;
+                },
+                code => sub {
+                    my ($perm) = shift;
+                    $perm->set_permissions('system');
                 },
             },
Index: /branches/release-40/build/mt-dists/default.mk
===================================================================
--- /branches/release-40/build/mt-dists/default.mk (revision 2615)
+++ /branches/release-40/build/mt-dists/default.mk (revision 2627)
@@ -2,5 +2,5 @@
 
 PRODUCT_VERSION = 4.2
-SCHEMA_VERSION = 4.0065
+SCHEMA_VERSION = 4.0066
 API_VERSION = 4.2