diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 0ce8caab7..57525d1bc 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -776,7 +776,7 @@ EOF
 								$iFlags = $iFlags | $aExtraFlags[$sAttCode];
 							}
 							$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-							if ((!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0))
+							if ((!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0) && !($oAttDef instanceof AttributeDashboard))
 							{
 								$sInputId = $this->m_iFormId.'_'.$sAttCode;
 								if ($oAttDef->IsWritable())
diff --git a/application/datatable.class.inc.php b/application/datatable.class.inc.php
index 185ccef42..de8051918 100644
--- a/application/datatable.class.inc.php
+++ b/application/datatable.class.inc.php
@@ -771,7 +771,7 @@ class DataTableSettings implements Serializable
 			$aTempData = array();
 			foreach($aList as $sAttCode => $oAttDef)
 			{
-				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!$oAttDef instanceof AttributeLinkSet))
+				if ( (!array_key_exists($sAttCode, $this->aColumns[$sAlias])) && (!($oAttDef instanceof AttributeLinkedSet || $oAttDef instanceof AttributeDashboard)))
 				{
 					$aFieldData = $this->GetFieldData($sAlias, $sAttCode, $oAttDef, false /* bChecked */, 'none');
 					if ($aFieldData) $aTempData[$aFieldData['label']] = $aFieldData;