diff --git src/wp-activate.php src/wp-activate.php
index b13279a..bb0e0dc 100644
--- src/wp-activate.php
+++ src/wp-activate.php
@@ -11,7 +11,7 @@ define( 'WP_INSTALLING', true );
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require( ABSPATH . WPINC . '/template-loader.php' );
 
 if ( !is_multisite() ) {
 	wp_redirect( wp_registration_url() );
@@ -21,9 +21,6 @@ if ( !is_multisite() ) {
 if ( is_object( $wp_object_cache ) )
 	$wp_object_cache->cache_enabled = false;
 
-// Fix for page title
-$wp_query->is_404 = false;
-
 /**
  * Fires before the Site Activation page is loaded.
  *
diff --git src/wp-signup.php src/wp-signup.php
index 156de61..f2c677a 100644
--- src/wp-signup.php
+++ src/wp-signup.php
@@ -5,7 +5,7 @@ require( dirname(__FILE__) . '/wp-load.php' );
 
 add_action( 'wp_head', 'wp_no_robots' );
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require( ABSPATH . WPINC . '/template-loader.php' );
 
 if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
 	wp_redirect( network_home_url() );
@@ -37,9 +37,6 @@ if ( !is_main_site() ) {
 	die();
 }
 
-// Fix for page title
-$wp_query->is_404 = false;
-
 /**
  * Fires before the Site Signup page is loaded.
  *