diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 7edeea4a41..c8bfc4de59 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -20,9 +20,7 @@ include('admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
-<input type='hidden' name='option_page' value='discussion' />
-<input type="hidden" name="action" value="update" />
-<?php wp_nonce_field('discussion-options') ?>
+<?php settings_fields('discussion'); ?>
 
 <table class="form-table">
 <tr valign="top">
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index f2e898ed4a..fafcbdd20f 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -21,10 +21,7 @@ include('admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form action="options.php" method="post">
-<input type="hidden" name="action" value="update" />
-<?php wp_nonce_field( 'media-options' ); ?>
-<input type='hidden' name='option_page' value='media' />
-<input type="hidden" name="page_options" value="thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h,image_default_size,image_default_align,image_default_link_type,large_size_w,large_size_h" /> <!-- is this needed anymore TODO -->
+<?php settings_fields('media'); ?>
 
 <p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>
 
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 15d61fcc6e..e1b61901ec 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -21,9 +21,7 @@ include('admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
-<input type='hidden' name='option_page' value='misc' />
-<input type="hidden" name="action" value="update" />
-<?php wp_nonce_field('misc-options') ?>
+<?php settings_fields('misc'); ?>
 
 <h3><?php _e('Uploading Files'); ?></h3>
 <table class="form-table">
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index f4ac853f8a..3d22a73b28 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -20,9 +20,7 @@ include('./admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
-<?php wp_nonce_field('privacy-options') ?>
-<input type='hidden' name='option_page' value='privacy' />
-<input type="hidden" name="action" value="update" />
+<?php settings_fields('privacy'); ?>
 
 <table class="form-table">
 <tr valign="top">
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index f4b497bc3e..3608b8cd66 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -20,9 +20,7 @@ include('admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form name="form1" method="post" action="options.php">
-<?php wp_nonce_field('reading-options') ?>
-<input type='hidden' name='option_page' value='reading' />
-<input type="hidden" name="action" value="update" />
+<?php settings_fields('reading'); ?>
 
 <table class="form-table">
 <?php if ( get_pages() ): ?>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index ede84ebf3f..2d7718c979 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -20,9 +20,7 @@ include('admin-header.php');
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 <form method="post" action="options.php">
-<?php wp_nonce_field('writing-options') ?>
-<input type='hidden' name='option_page' value='writing' />
-<input type="hidden" name="action" value="update" />
+<?php settings_fields('writing'); ?>
 
 <table class="form-table">
 <tr valign="top">