diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 384516f3b..fdeef39d6 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -181,7 +181,7 @@ $menu[75] = array( __('Tools'), 'read', 'tools.php', '', 'menu-top', 'menu-tools
 	$submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
 	if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
 		$submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
-	if ( !is_multisite() && is_super_admin() && defined('WP_ENABLE_MULTISITE') )
+	if ( !is_multisite() && is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
 		$submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
diff --git a/wp-admin/network.php b/wp-admin/network.php
index db4a3426a..4a41dbea5 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -25,6 +25,9 @@ include( ABSPATH . 'wp-admin/includes/network.php' );
 foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
 	$wpdb->$table = $prefixed_table;
 
+if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
+	wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
+
 $title = __( 'Create a Network of WordPress Sites' );
 $parent_file = 'tools.php';