diff --git a/NEWS b/NEWS
index 48febe25..2508f4e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+    - fixed bug with label for html_options (Monte)
     - added caching to config file loading (Monte)
     - added "extra" parameter to mailto function (Monte,
       Massimiliano Perantoni)
diff --git a/libs/plugins/function.html_options.php b/libs/plugins/function.html_options.php
index 6ffc17ba..e68f6c93 100644
--- a/libs/plugins/function.html_options.php
+++ b/libs/plugins/function.html_options.php
@@ -43,7 +43,7 @@ function smarty_function_html_options($params, &$smarty)
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
 	if(!is_array($value)) {
-    	$html_result = "<option label=\"$key\" value=\"$key\"";
+    	$html_result = "<option label=\"$value\" value=\"$key\"";
     	if (in_array($key, $selected))
         	$html_result .= " selected=\"selected\"";
     	$html_result .= ">$value</option>\n";
@@ -54,7 +54,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected) {
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-	$optgroup_html = "<optgroup label=\"$key\">\n";
+	$optgroup_html = "<optgroup label=\"$value\">\n";
 	foreach ($values as $key => $value) {
 		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
 	}
diff --git a/plugins/function.html_options.php b/plugins/function.html_options.php
index 6ffc17ba..e68f6c93 100644
--- a/plugins/function.html_options.php
+++ b/plugins/function.html_options.php
@@ -43,7 +43,7 @@ function smarty_function_html_options($params, &$smarty)
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
 	if(!is_array($value)) {
-    	$html_result = "<option label=\"$key\" value=\"$key\"";
+    	$html_result = "<option label=\"$value\" value=\"$key\"";
     	if (in_array($key, $selected))
         	$html_result .= " selected=\"selected\"";
     	$html_result .= ">$value</option>\n";
@@ -54,7 +54,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected) {
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-	$optgroup_html = "<optgroup label=\"$key\">\n";
+	$optgroup_html = "<optgroup label=\"$value\">\n";
 	foreach ($values as $key => $value) {
 		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
 	}