diff --git a/wp-admin/options.php b/wp-admin/options.php
index 7d78656845..1b9abbb7bc 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -53,6 +53,10 @@ case 'update':
             if( in_array($option, $nonbools) && ( $value == '0' || $value == '') )
 	      $value = 'closed';
 
+	    if( $option == 'blogdescription' || $option == 'blogname' )
+		    if (current_user_can('unfiltered_html') == false)
+			    $value = wp_filter_post_kses( $value );
+
 	    if ( update_option($option, $value) )
 	      $any_changed++;
 	  }