diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 63061d1109..992aed1232 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -20,7 +20,7 @@ if (0 == $post_ID) {
 	$form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
 }
 
-$form_pingback = '<input type="hidden" name="post_pingback" value="1" id="post_pingback" />';
+$form_pingback = '<input type="hidden" name="post_pingback" value="' . get_option('default_pingback_flag') . '" id="post_pingback" />';
 
 $form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
 
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 9aec813647..0407666fb6 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -50,7 +50,7 @@ edCanvas = document.getElementById('content');
 //-->
 </script>
 
-<input type="hidden" name="post_pingback" value="1" id="post_pingback" />
+<input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />
 
 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
 	<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>