Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 2429)
+++ wp-admin/post.php	(working copy)
@@ -308,7 +308,7 @@
 	if ( 'publish' == $post_status && (!user_can_create_post($user_ID)) && 2 != get_option('new_users_can_blog') )
 		$post_status = 'draft';
 
-	if (empty($post_name) || 'draft' == $post_status ) {
+	if (empty($post_name) || 'draft' == $post_status || 'draft' == $prev_status ) {
 		$post_name = sanitize_title($post_title, $post_ID);
 	} else {
 		$post_name = sanitize_title($post_name, $post_ID);