diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 3b2551b403..d3d2fbaef6 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -24,7 +24,8 @@ include('admin-header.php');
 <?php _e('Users should use the visual rich editor by default') ?></label><br />
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
-<?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label>
+<?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
+<label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
 </td>
 </tr>
 <tr valign="top">
@@ -89,7 +90,7 @@ endforeach;
 
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category" /> 
+<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" /> 
 </p>
 </form> 
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index a243d49962..f612c3a418 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -17,7 +17,7 @@ $bookmarklet_height= 440;
 <?php } ?>
 
 <div class="wrap">
-<h2><?php _e('Your Profile'); ?></h2>
+<h2><?php _e('Your Profile and Personal Options'); ?></h2>
 <form name="profile" id="your-profile" action="profile-update.php" method="post">
 <p>
 <input type="hidden" name="from" value="profile" />
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index d89f3571cd..644189da07 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -161,7 +161,7 @@ function populate_options() {
 	add_option('users_can_register', 0);
 	add_option('admin_email', 'you@example.com');
 	add_option('start_of_week', 1);
-	add_option('use_balanceTags', 1);
+	add_option('use_balanceTags', 0);
 	add_option('use_smilies', 1);
 	add_option('require_name_email', 1);
 	add_option('comments_notify', 1);
diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index 1352eebc30..c179df2d74 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -392,9 +392,8 @@ function funky_javascript_fix($text) {
 */
 function balanceTags($text, $is_comment = 0) {
 	
-	if (get_settings('use_balanceTags') == 0) {
+	if ( get_option('use_balanceTags') == 0)
 		return $text;
-	}
 
 	$tagstack = array(); $stacksize = 0; $tagqueue = ''; $newtext = '';