diff --git a/wp-settings.php b/wp-settings.php
index e24cc7d02..36f0f6053 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -273,7 +273,7 @@ require( ABSPATH . WPINC . '/locale.php' );
 $wp_locale = new WP_Locale();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
-if ( ! defined( 'WP_INSTALLING' ) ) {
+if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
 	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
 		include( STYLESHEETPATH . '/functions.php' );
 	if ( file_exists( TEMPLATEPATH . '/functions.php' ) )