diff --git a/wp-admin/network/admin.php b/wp-admin/network/admin.php
index d4374de09..145c25d1b 100644
--- a/wp-admin/network/admin.php
+++ b/wp-admin/network/admin.php
@@ -15,7 +15,7 @@ require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
-if ( ! is_main_site() ) {
+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
 	wp_redirect( network_admin_url() );
 	exit;
 }
diff --git a/wp-admin/user/admin.php b/wp-admin/user/admin.php
index 4b8423f40..42850f4b2 100644
--- a/wp-admin/user/admin.php
+++ b/wp-admin/user/admin.php
@@ -16,7 +16,7 @@ if ( ! is_multisite() ) {
 	exit;
 }
 
-if ( ! is_main_site() ) {
+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
 	wp_redirect( user_admin_url() );
 	exit;
 }