diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 3b32a8071f..d7addba151 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -242,6 +242,8 @@ switch ( $action ) {
 						echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>";
 						reset($blogusers);
 						foreach ( (array) $blogusers as $key => $val ) {
+							if ( isset( $val->meta_value ) && ! $val->meta_value )
+								continue; 
 							$t = @unserialize( $val->meta_value );
 							if ( is_array( $t ) ) {
 								reset( $t );
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 0fb7e90961..ec361def9f 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -280,12 +280,15 @@ function get_blog_option( $blog_id, $setting, $default = false ) {
 		if ( $blog_id == $wpdb->blogid ) {
 			$value = get_option( $setting, $default );
 			$notoptions = wp_cache_get( 'notoptions', 'options' );
-			if ( isset( $notoptions[$setting] ) )
+			if ( isset( $notoptions[$setting] ) ) {
 				wp_cache_set( $key, 'noop', 'site-options' );
-			elseif ( $value == false )
+				$value = $default;
+			} elseif ( $value == false ) {
 				wp_cache_set( $key, 'falsevalue', 'site-options' );
-			else
+			} else {
 				wp_cache_set( $key, $value, 'site-options' );
+			}
+			return apply_filters( 'blog_option_' . $setting, $value, $blog_id );
 		} else {
 			$blog_prefix = $wpdb->get_blog_prefix( $blog_id );
 			$row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
@@ -552,4 +555,4 @@ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
 		return array_slice( $blogs, $start, $num );
 }
 
-?>
\ No newline at end of file
+?>