diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 1463e7faf4..c7d6d7c5fd 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -71,10 +71,6 @@ window.onload = focusit;
       <legend><a href="http://wordpress.org/docs/reference/post/#category" title="Help on categories">Categories</a></legend> 
 	  <div><?php dropdown_categories($default_post_cat); ?></div>
     </fieldset>
-    <fieldset id="postpassworddiv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#post_password" title="Help on post password">Post Password</a></legend> 
-	  <div><input name="post_password" type="text" size="18" tabindex="3" id="post_password" value="<?php echo $post_password ?>" /></div>
-    </fieldset>
 
 <br />
 <fieldset style="clear:both">
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index c3df335f7a..3a1f2c6c67 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -40,7 +40,29 @@ ob_start();
 	<li><a href="edit-comments.php">Latest Comments</a></li>
 	<li class="last"><a href="moderation.php">Comments Awaiting Moderation</a></li>
 </ul>
-
+<?php
+get_currentuserinfo();
+$drafts = $wpdb->get_results("SELECT ID, post_title FROM $tableposts WHERE post_status = 'draft' AND post_author = $user_ID");
+if ($drafts) {
+	?>
+	<div class="wrap">
+	<p><strong>Your Drafts:</strong>
+	<?php
+	$i = 0;
+	foreach ($drafts as $draft) {
+		if (0 != $i)
+			echo ', ';
+		$draft->post_title = stripslashes($draft->post_title);
+		if ($draft->post_title == '')
+			$draft->post_title = 'Post #'.$draft->ID;
+		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='Edit this draft'>$draft->post_title</a>";
+		++$i;
+		}
+	?>.</p>
+	</div>
+	<?php
+}
+?>
 <div class="wrap">
 <table width="100%">
   <tr>
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 30f3db91ec..4d5e68cd71 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -54,7 +54,8 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
         }
     }
 }
-
+$link_url = stripslashes($HTTP_GET_VARS['linkurl']);
+$link_name = htmlentities(stripslashes(urldecode($HTTP_GET_VARS['name'])));
 require('admin-header.php');
 ?>
 <ul id="adminmenu2">
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 0195f3f2be..becd6b98d0 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -58,9 +58,12 @@ switch($action) {
 				}
 			}
 			$post_status = $HTTP_POST_VARS['post_status'];
+			if (empty($post_status)) $post_status = get_settings('default_post_status');
 			$comment_status = $HTTP_POST_VARS['comment_status'];
+			if (empty($comment_status)) $comment_status = get_settings('default_comment_status');
 			$ping_status = $HTTP_POST_VARS['ping_status'];
-			$post_password = addslashes($HTTP_POST_VARS['post_password']);
+			if (empty($ping_status)) $ping_status = get_settings('default_ping_status');
+			$post_password = addslashes(stripslashes($HTTP_POST_VARS['post_password']));
 			$post_name = sanitize_title($post_title);
 			$trackback = $HTTP_POST_VARS['trackback_url'];
 		// Format trackbacks
@@ -262,8 +265,11 @@ switch($action) {
 			}
 			$post_status = $HTTP_POST_VARS['post_status'];
 			$prev_status = $HTTP_POST_VARS['prev_status'];
+			$post_status = $HTTP_POST_VARS['post_status'];
 			$comment_status = $HTTP_POST_VARS['comment_status'];
+			if (empty($comment_status)) $post_status = get_settings('default_comment_status');
 			$ping_status = $HTTP_POST_VARS['ping_status'];
+			if (empty($ping_status)) $post_status = get_settings('default_ping_status');
 			$post_password = addslashes($HTTP_POST_VARS['post_password']);
 			$post_name = sanitize_title($post_title);
 			$trackback = $HTTP_POST_VARS['trackback_url'];
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 66353e10e6..0f5c41c1f6 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -207,7 +207,7 @@ textarea, input, select {
 
 #categorydiv {
 	line-height: 130%;
-	margin-right: 5px;
+	margin-right: 15px;
 	position: absolute;
 	right: 5%;
 	width: 9em;