diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php
index 37650ea512..3bb7da854d 100644
--- a/wp-admin/admin-db.php
+++ b/wp-admin/admin-db.php
@@ -108,7 +108,7 @@ function wp_insert_category($catarr) {
 	$category_description = apply_filters('pre_category_description', $category_description);
 
 	$category_parent = (int) $category_parent;
-	if ( empty($category_parent) || !get_category( $category_parent ) )
+	if ( empty($category_parent) || !get_category( $category_parent ) || $category_parent == $cat_ID )
 		$category_parent = 0;
 
 	if ( isset($posts_private) )
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index 39c06bcaa5..dc431b95e4 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -32,10 +32,8 @@ if ( ! empty($cat_ID) ) {
 		<tr>
 			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
 			<td>        
-			<select name='category_parent' id='category_parent'>
-	  <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
-	  <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
-	  </select></td>
+	  			<?php wp_dropdown_categories('hide_empty=0&name=category_parent&selected=' . $category->category_parent . '&hierarchical=1&show_option_none=' . __('None')); ?>
+	  		</td>
 		</tr>
 		<tr>
 			<th scope="row" valign="top"><label for="category_description"><?php _e('Description: (optional)') ?></label></th>
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index bf6caba8d6..1e98db1c20 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -696,7 +696,7 @@ class Walker_CategoryDropdown extends Walker {
 		if ( $category->cat_ID == $args['selected'] )
 			$output .= ' selected="selected"';
 		$output .= '>';
-		$output .= $cat_name;
+		$output .= $pad.$cat_name;
 		if ( $args['show_count'] )
 			$output .= '&nbsp;&nbsp;('. $category->category_count .')';
 		if ( $args['show_last_update'] ) {