diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 672e37357c..63061d1109 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -70,7 +70,9 @@ window.onload = focusit;
 
     <fieldset id="commentstatusdiv">
       <legend><a href="http://wordpress.org/docs/reference/post/#comments" title="<?php _e('Help on comment status') ?>"><?php _e('Discussion') ?></a></legend> 
-	  <div><label for="comment_status" class="selectit">
+	  <div>
+	  <input name="advanced_view" type="hidden" value="1" />
+	  <label for="comment_status" class="selectit">
 	      <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($comment_status, 'open'); ?> />
          <?php _e('Allow Comments') ?></label> 
 		 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 31f5c002e1..b2fa722140 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -38,7 +38,9 @@ window.onload = focusit;
     </fieldset>
 <fieldset id="commentstatusdiv">
       <legend><?php _e('Discussion') ?></legend> 
-	  <div><label for="comment_status" class="selectit">
+	  <div>
+	  <input name="advanced_view" type="hidden" value="1" />
+	  <label for="comment_status" class="selectit">
 	      <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($comment_status, 'open'); ?> />
          <?php _e('Allow Comments') ?></label> 
 		 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 2602ca17b6..3715a8f4e8 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -37,6 +37,7 @@ case 'post':
 	$post_name = $_POST['post_name'];
 	$post_parent = 0;
 	$menu_order  = 0;
+	
 
 	if ( isset($_POST['parent_id']) )
 		$post_parent = $_POST['parent_id'];
@@ -60,10 +61,10 @@ case 'post':
 	if ( 'publish' == $post_status && (!user_can_create_post($user_ID)) && 2 != get_option('new_users_can_blog') )
 		$post_status = 'draft';
 	$comment_status = $_POST['comment_status'];
-	if ( empty($comment_status) )
+	if ( empty($comment_status) && !isset($_POST['advanced_view']) )
 		$comment_status = get_option('default_comment_status');
 	$ping_status = $_POST['ping_status'];
-	if ( empty($ping_status) )
+	if ( empty($ping_status) && !isset($_POST['advanced_view']) )
 		$ping_status = get_option('default_ping_status');
 	$post_password = $_POST['post_password'];