diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index f8e86ed503f..efc97ad63f2 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1317,12 +1317,25 @@ class FormSetupItem
public function generateOutputFieldColor()
{
global $langs;
+ $out = '';
$this->fieldAttr['disabled'] = null;
$color = colorArrayToHex(colorStringToArray($this->fieldValue, array()), '');
- if ($color) {
- return '';
+ $useDefaultColor = false;
+ if (!$color && !empty($this->defaultFieldValue)) {
+ $color = $this->defaultFieldValue;
+ $useDefaultColor = true;
}
- return $langs->trans("Default");
+ if ($color) {
+ $out.= '';
+ }
+
+ if ($useDefaultColor) {
+ $out.= ' '.$langs->trans("Default");
+ } else {
+ $out.= ' #'.$color;
+ }
+
+ return $out;
}
/**
* generateInputFieldColor