diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index affa0bbc2..f991c4cca 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -77,7 +77,7 @@ addLoadEvent(blurry);
 </script>
 <script type="text/javascript" src="fat.js"></script>
 <?php if ( isset( $editing ) ) : ?>
-<?php if ( get_option('rich_editing') ) :?>
+<?php if ( 'true' == get_user_option('rich_editing') ) :?>
 <script type="text/javascript" src="tinymce/tiny_mce_src.js"></script>
 <script type="text/javascript">
 tinyMCE.init({
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 9e1d506a2..405f8b74c 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -130,7 +130,7 @@ endforeach;
 
 <fieldset id="postdiv">
 <legend><?php _e('Post') ?></legend>
-<?php if ( !get_option('rich_editing') ) : ?>
+<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
 <?php the_quicktags(); ?>
 <script type="text/javascript">
 <!--
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index bda0a7a75..33a1dba65 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -37,7 +37,7 @@ addLoadEvent(focusit);
 
 <fieldset style="clear: both;">
         <legend><?php _e('Comment') ?></legend>
-<?php if ( !get_option('rich_editing') ) : ?>
+<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
 <?php the_quicktags(); ?>
 <script type="text/javascript">
 <!--
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 42c0f8174..ad6d75dd2 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -117,7 +117,7 @@ endforeach;
 
 <fieldset id="postdiv">
     <legend><?php _e('Page Content') ?></legend>
-<?php if ( !get_option('rich_editing') ) : ?>
+<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
 <?php the_quicktags(); ?>
 <script type="text/javascript">
 <!--