diff --git a/wp-admin/wp-edit.form.php b/wp-admin/wp-edit.form.php
index 69205f6771..f9b6f87dbb 100644
--- a/wp-admin/wp-edit.form.php
+++ b/wp-admin/wp-edit.form.php
@@ -28,6 +28,7 @@ switch($action) {
 			$form_trackback = '';
 		}
 		$colspan = 3;
+		$saveasdraft = '<input name="save" type="submit" id="save" tabindex="6" value="Save and Continue Editing" />';
 		break;
 	case "edit":
 		$submitbutton_text = 'Edit this!';
@@ -185,7 +186,7 @@ if ($use_quicktags) {
 <?php
 if ($use_quicktags) {
 ?>
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
 <!--
 edCanvas = document.getElementById('content');
 //-->
@@ -210,7 +211,7 @@ if (get_settings('use_geo_positions')) {
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
 
-<p><input type="submit" name="submit" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
+<p><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
   <input name="referredby" type="hidden" id="referredby" value="<?php echo $HTTP_SERVER_VARS['HTTP_REFERER']; ?>" />
 </p>
 
diff --git a/wp-admin/wp-post.php b/wp-admin/wp-post.php
index 1f524686cf..ead3b8a6d3 100644
--- a/wp-admin/wp-post.php
+++ b/wp-admin/wp-post.php
@@ -81,6 +81,8 @@ switch($action) {
         } else {
             $now = date('Y-m-d H:i:s', (time() + ($time_difference * 3600)));
         }
+		
+		if ('' != $HTTP_POST_VARS['save']) $post_status = 'draft';
 
         if((get_settings('use_geo_positions')) && (strlen($latstr) > 2) && (strlen($lonstr) > 2) ) {
 		$postquery ="INSERT INTO $tableposts
@@ -145,6 +147,8 @@ switch($action) {
         } else {
             $location = 'wp-post.php';
         }
+		
+		if ('' != $HTTP_POST_VARS['save']) $location = "wp-post.php?action=edit&post=$post_ID";
         header("Location: $location");
         exit();
         break;