--- wordpress-mu/wp-admin/wpmu-terms.php	2010-03-03 08:22:25.000000000 -0800
+++ wpmu-terms.php	2010-05-14 11:18:49.000000000 -0700
@@ -76,7 +76,8 @@
 		switch_to_blog( $id );
 	}
 	
-	$maxterm = $wpdb->get_var( "SELECT max(cat_ID) FROM {$wpdb->sitecategories}" );
+	$maxterm = max($wpdb->get_var( "SELECT max(cat_ID) FROM {$wpdb->sitecategories}" ),
+	               $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" ) );
 	$rows = $wpdb->get_results( "SELECT * FROM {$wpdb->terms}" );
 	foreach( $rows as $row ) {
 		if ( isset( $_POST[ 'renameterms' ] ) && sanitize_title( $row->name ) != $row->slug ) {
@@ -87,7 +88,7 @@
 		}
 		if ( $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->sitecategories} WHERE cat_ID = %d AND category_nicename = %s", $row->term_id, $row->slug ) ) )
 			continue;
-		$term_id = $row->term_id + mt_rand( $maxterm+100, $maxterm+4000 );
+		$term_id = $row->term_id + $maxterm;
 		if( get_option( 'default_category' ) == $row->term_id )
 			update_option( 'default_category', $term_id );
 
