diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index 4442b0ca412f79fb318feca200754d2aefc25123..4194034cd8c666fee578cef3f688893137c236fe 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -510,7 +510,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
 					$picklistNameRaw = $db->query_result($result, $i, $fieldName);
 					$picklistName = decode_html($picklistNameRaw);
 					// show color only for accesable picklist values
-					if($isRoleBasedPicklist && !isset($accessablePicklistValues[$picklistNameRaw])) {
+					if($isRoleBasedPicklist && !isset($accessablePicklistValues[$picklistName	])) {
 						$color = '';
 					}
 					if(!empty($color)) {
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index ff7856806f9f04a57fd0d54545b3518c95301a07..f8a6f217b58e179535c28e9bbca7fc0aedb7c3d4 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -1239,7 +1239,7 @@ class Vtiger_Util_Helper {
 
 	public static function convertSpaceToHyphen($string) {
 		if (!empty($string)) {
-			return str_replace(" ", "-", $string);
+			return str_replace(" ", "-", decode_html($string));
 		}
 	}