diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 137937ceee..43bc15b133 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -149,6 +149,9 @@ function get_default_post_to_edit() {
 	$post->post_content = apply_filters('default_content', $content);
 	$post->post_title = apply_filters('default_title', $edited_post_title);
 	$post->post_excerpt = apply_filters('default_excerpt', $excerpt);
+	$post->page_template = 'default';
+	$post->post_parent = 0;
+	$post->menu_order = 0;
 
 	return $post;
 }
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index a906f3a70e..87cd25898f 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -115,8 +115,8 @@ edCanvas = document.getElementById('content');
 		<select name="post_author" id="post_author">
 		<?php 
 		foreach ($users as $o) :
-			$o = get_userdata( $O->ID );
-			if ( $post->post_author == $o->ID ) $selected = 'selected="selected"';
+			$o = get_userdata( $o->ID );
+			if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
 			else $selected = '';
 			echo "<option value='$o->ID' $selected>$o->user_login ($o->first_name $o->last_name)</option>";
 		endforeach;
diff --git a/wp-admin/page-new.php b/wp-admin/page-new.php
index 770f8e2f21..b2432d89a5 100644
--- a/wp-admin/page-new.php
+++ b/wp-admin/page-new.php
@@ -15,13 +15,9 @@ get_currentuserinfo();
 if ($user_level > 0) {
 	$action = 'post';
 	get_currentuserinfo();
-	//set defaults
-	$post_status = 'static';
-	$comment_status = get_settings('default_comment_status');
-	$ping_status = get_settings('default_ping_status');
-	$post_pingback = get_settings('default_pingback_flag');
-	$post_parent = 0;
-	$page_template = 'default';
+	
+	$post = get_default_post_to_edit();
+	$post->post_status = 'static';
 
 	include('edit-page-form.php');
 }