diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 1a5603ccd..3ab5cc22f 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1276,7 +1276,7 @@ function add_submenu_page($parent, $page_title, $menu_title, $access_level, $fil
 }
 
 function add_options_page($page_title, $menu_title, $access_level, $file, $function = '') {
-	return add_submenu_page('options-personal.php', $page_title, $menu_title, $access_level, $file, $function);
+	return add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file, $function);
 }
 
 function add_management_page($page_title, $menu_title, $access_level, $file, $function = '') {
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 093d64e9c..5d84cb138 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -260,7 +260,7 @@ function ajaxNewCat() {
 <?php
 require(ABSPATH . '/wp-admin/menu-header.php');
 
-if ( $parent_file == 'options-personal.php' ) {
+if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . '/wp-admin/options-head.php');
 }
 ?>
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 410f6fece..bd0fd4500 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -14,7 +14,7 @@ if ( current_user_can('edit_users') )
 	$menu[35] = array(__('Users'), 'read', 'profile.php');
 else
 	$menu[35] = array(__('Profile'), 'read', 'profile.php');
-$menu[40] = array(__('Options'), 'read', 'options-personal.php');
+$menu[40] = array(__('Options'), 'read', 'options-general.php');
 $menu[45] = array(__('Import'), 'import', 'import.php');
 
 if ( get_option('use_fileupload') )
@@ -39,13 +39,12 @@ $submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'li
 $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
 $submenu['profile.php'][10] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
 
-$submenu['options-personal.php'][5] = array(__('Personal'), 'read', 'options-personal.php');
-$submenu['options-personal.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
-$submenu['options-personal.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
-$submenu['options-personal.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
-$submenu['options-personal.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
-$submenu['options-personal.php'][30] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
-$submenu['options-personal.php'][35] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
+$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
+$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
+$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
+$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
+$submenu['options-general.php'][30] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+$submenu['options-general.php'][35] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
 
 $submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
 $submenu['plugins.php'][10] = array(__('Plugin Editor'), 'edit_plugins', 'plugin-editor.php');
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 792c834d7..1712bcde9 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Discussion Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 include('admin-header.php');
 
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 690f897b4..5620eccff 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('General Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 138833b3a..51014a07e 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Miscellaneous Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 include('admin-header.php');
 
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 5d1a84fca..044ec08d2 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Permalink Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 function add_js() {
 ?>
diff --git a/wp-admin/options-personal-update.php b/wp-admin/options-personal-update.php
deleted file mode 100644
index e2114496d..000000000
--- a/wp-admin/options-personal-update.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once('admin.php');
-
-check_admin_referer();
-
-if ( isset( $_POST['action'] ) ) {
-	if ( !isset( $_POST['rich_editing'] ) )
-		$_POST['rich_editing'] = 'false';
-	update_user_option( $current_user->id, 'rich_editing', $wpdb->escape($_POST['rich_editing']), true );
-	do_action('personal_options_update');
-
-	$goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']);
-	$goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
-	wp_redirect($goback);
-}
-
-?>
\ No newline at end of file
diff --git a/wp-admin/options-personal.php b/wp-admin/options-personal.php
deleted file mode 100644
index 4afffc369..000000000
--- a/wp-admin/options-personal.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once('admin.php');
-
-$title = __('Personal Options');
-$parent_file = 'options-personal.php';
-
-include('admin-header.php');
-?>
-
-<div class="wrap"> 
-<h2><?php _e('Personal Options') ?></h2> 
-<form id="personal-options" method="post" action="options-personal-update.php"> 
-<fieldset>
-<p><?php _e('Personal options are just for you, they don&#8217;t affect other users on blog.'); ?><input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="rich_editing<?php do_action('personal_option_list'); ?>" /></p>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Editing:') ?></th> 
-<td><label for="rich_editing">
-<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
-<?php _e('Use the visual rich editor when writing') ?></label></td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('More:') ?></th> 
-<td>We should really figure out what else to put here.</td> 
-</tr> 
-<?php do_action('personal_options_table'); ?>
-</table>
-
-</fieldset> 
-<p class="submit">
-<input type="submit" name="Submit" value="<?php _e('Update Personal Options') ?> &raquo;" />
-</p>
-</form> 
-</div> 
-<?php include('admin-footer.php'); ?>
\ No newline at end of file
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 1274fd14a..30f06d27a 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Reading Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index f3be84959..813dbd39e 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Writing Options');
-$parent_file = 'options-personal.php';
+$parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
diff --git a/wp-admin/profile-update.php b/wp-admin/profile-update.php
index 2f6d15315..b3cb166f6 100644
--- a/wp-admin/profile-update.php
+++ b/wp-admin/profile-update.php
@@ -4,6 +4,9 @@ require_once('admin.php');
 
 check_admin_referer();
 
+if ( !$_POST )
+	die( __('No post?') );
+
 $errors = edit_user($user_ID);
 
 if (count($errors) != 0) {
@@ -13,6 +16,12 @@ if (count($errors) != 0) {
 	exit;
 }
 
+if ( !isset( $_POST['rich_editing'] ) )
+	$_POST['rich_editing'] = 'false';
+update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
+
+do_action('personal_options_update');
+
 if ( 'profile' == $_POST['from'] )
 	$to = 'profile.php?updated=true';
 else
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index ad586598b..a243d4996 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -105,6 +105,14 @@ if ( $show_password_fields ) :
 <?php do_action('show_user_profile'); ?>
 
 <br clear="all" />
+
+<h3><?php _e('Personal Options'); ?></h3>
+
+<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
+<?php _e('Use the visual rich editor when writing') ?></label></p>
+
+<?php do_action('profile_personal_options'); ?>
+
   <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
     <?php
     if(count($profileuser->caps) > count($profileuser->roles)):