diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 788a4bd..0b50abc 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -44,8 +44,12 @@ class Walker_Category_Checklist extends Walker {
 		else
 			$name = 'tax_input['.$taxonomy.']';
 
+		$taxonomy_obj = get_taxonomy( $taxonomy );
+		
+		$value = $taxonomy_obj->hierarchical ? esc_attr( $category->term_id ): esc_attr( $category->name );
+		
 		$class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
-		$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
+		$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $value . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . checked( in_array( $category->term_id, $selected_cats ), true, false ) . disabled( empty( $args['disabled'] ), false, false ) . ' /> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
 	}
 
 	function end_el( &$output, $category, $depth = 0, $args = array() ) {
@@ -99,7 +103,7 @@ function wp_terms_checklist($post_id = 0, $args = array()) {
 	$args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
 
 	extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-
+	
 	if ( empty($walker) || !is_a($walker, 'Walker') )
 		$walker = new Walker_Category_Checklist;