Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 20505)
+++ wp-includes/ms-functions.php	(working copy)
@@ -1216,7 +1216,7 @@
 		return false;
 
 	$welcome_email = stripslashes( get_site_option( 'welcome_email' ) );
-	if ( $welcome_email == false )
+	if ( false == $welcome_email )
 		$welcome_email = stripslashes( __( 'Dear User,
 
 Your new SITE_NAME site has been successfully set up at:
@@ -1279,8 +1279,21 @@
 	if ( !apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta) )
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_user_email' );
+	$welcome_email = stripslashes( get_site_option( 'welcome_user_email' ) );
+	if ( false == $welcome_email )
+		$welcome_email = __( 'Dear User,
 
+Your new account is set up.
+
+You can log in with the following information:
+Username: USERNAME
+Password: PASSWORD
+LOGINLINK
+
+Thanks!
+
+--The Team @ SITE_NAME' );
+
 	$user = new WP_User($user_id);
 
 	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
@@ -1909,7 +1922,6 @@
 	}
 	return $text;
 }
-add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
 
 /**
  * Whether to force SSL on content.