diff --git a/wp-admin/optionhandler.php b/wp-admin/optionhandler.php
index 4082593305..b5143532fe 100644
--- a/wp-admin/optionhandler.php
+++ b/wp-admin/optionhandler.php
@@ -43,7 +43,7 @@ BOOLSELECT;
         case 5: // select
             $ret = <<<SELECT
                     <label for="$option_result->option_name">$option_result->option_name</label>$between
-                    <select name="$option_result->option_name" $disabled>
+                    <select name="$option_result->option_name" id="$option_result->option_name" $disabled>
 SELECT;
 
             $select = $wpdb->get_results("SELECT optionvalue, optionvalue_desc "
@@ -72,13 +72,13 @@ SELECT;
             }
 
             // now we may need to do table name substitution
-            eval("include('../wp-config.php');\$sql = \"$sql\";");
+           eval("include('../wp-config.php');\$sql = \"$sql\";");
 
             $ret = <<<SELECT
                     <label for="$option_result->option_name">$option_result->option_name</label>$between
                     <select name="$option_result->option_name" $disabled>
 SELECT;
-
+	
             $select = $wpdb->get_results("$sql");
             if ($select) {
                 foreach($select as $option) {
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index fcb4388b32..d10af11f7c 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -56,7 +56,7 @@ function upgrade_071() {
 }
 
 function upgrade_072() {
-	global $wpdb, $tableposts, $tablelinks, $tablelinkcategories, $tableoptions, $tableoptiontypes, $tableoptiongroups, $tableoptiongroup_options, $tableoptionvalues;
+	global $wpdb, $tableposts, $tablelinks, $tablelinkcategories, $tableoptions, $tableoptiontypes, $tableoptiongroups, $tableoptiongroup_options, $tableoptionvalues, $tablecategories;
 	maybe_add_column($tablelinks, 'link_notes', "ALTER TABLE $tablelinks ADD COLUMN link_notes MEDIUMTEXT NOT NULL DEFAULT '' ");
 	maybe_add_column($tablelinkcategories, 'show_images', "ALTER TABLE $tablelinkcategories ADD COLUMN show_images enum('Y','N') NOT NULL default 'Y'");
 	maybe_add_column($tablelinkcategories, 'show_description', "ALTER TABLE $tablelinkcategories ADD COLUMN show_description enum('Y','N') NOT NULL default 'Y'");