diff --git a/catalog/admin/includes/functions/general.php b/catalog/admin/includes/functions/general.php
index d47667d59..3281ea5f5 100644
--- a/catalog/admin/includes/functions/general.php
+++ b/catalog/admin/includes/functions/general.php
@@ -471,7 +471,7 @@ function tep_get_zone_code($country, $zone, $def_state) {
       $state_prov_values = tep_db_fetch_array($state_prov_query);
       $state_prov_code = $state_prov_values['zone_code'];
     }
-    
+
     return $state_prov_code;
   }
 
@@ -714,8 +714,8 @@ function tep_cfg_pull_down_tax_classes($tax_class_id, $key = '') {
 
 ////
 // Function to read in text area in admin
- function tep_cfg_textarea($text) {
-    return tep_draw_textarea_field('configuration_value', false, 35, 5, $text);
+ function tep_cfg_textarea($text, $key = '') {
+    return tep_draw_textarea_field('configuration['.$key.']', false, 35, 5, $text);
   }
 
   function tep_cfg_get_zone_name($zone_id) {
diff --git a/catalog/admin/includes/functions/html_output.php b/catalog/admin/includes/functions/html_output.php
index 377b0ac29..f10adb89a 100644
--- a/catalog/admin/includes/functions/html_output.php
+++ b/catalog/admin/includes/functions/html_output.php
@@ -327,7 +327,7 @@ function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = ''
 
     for ($i=0, $n=sizeof($values); $i<$n; $i++) {
       $field .= '<option value="' . tep_output_string($values[$i]['id']) . '"';
-      if ($default == $values[$i]['id']) {
+      if ($default == $values[$i]['id'] || (is_array($default) && in_array($values[$i]['id'], $default))) {
         $field .= ' selected="selected"';
       }
 
diff --git a/catalog/includes/functions/html_output.php b/catalog/includes/functions/html_output.php
index efa70be28..3ca1330fe 100644
--- a/catalog/includes/functions/html_output.php
+++ b/catalog/includes/functions/html_output.php
@@ -309,7 +309,7 @@ function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = ''
 
     for ($i=0, $n=sizeof($values); $i<$n; $i++) {
       $field .= '<option value="' . tep_output_string($values[$i]['id']) . '"';
-      if ($default == $values[$i]['id']) {
+      if ($default == $values[$i]['id'] || (is_array($default) && in_array($values[$i]['id'], $default))) {
         $field .= ' selected="selected"';
       }