diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 6ca2066838..f0b96b76e2 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -195,7 +195,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
 			self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) +
 				etemplate_widget_menupopup::typeOptions('select-account',',groups');
 		}
-		foreach($value as $name => $_value)
+		foreach($value as $name => &$_value)
 		{
 			if(strpos($name, 'options-') !== false && $_value)
 			{
@@ -204,6 +204,17 @@ class etemplate_widget_nextmatch extends etemplate_widget
 				{
 					self::$request->sel_options[$select] = array();
 				}
+				foreach($_value as &$label)
+				{
+					if(!is_array($label))
+					{
+						$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+					}
+					elseif($label['label'])
+					{
+						$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+					}
+				}
 				self::$request->sel_options[$select] += $_value;
 				// The client doesn't need them in content, but we can't unset them because
 				// some apps don't send them on re-load, pulling them from the session