diff --git a/application/twigextension.class.inc.php b/application/twigextension.class.inc.php
index 9a9cf8650..8a8cec26f 100644
--- a/application/twigextension.class.inc.php
+++ b/application/twigextension.class.inc.php
@@ -2,6 +2,7 @@
 
 namespace Combodo\iTop;
 
+use AttributeDate;
 use AttributeDateTime;
 use Dict;
 use Exception;
@@ -55,6 +56,10 @@ class TwigExtension
 						{
 							return AttributeDateTime::GetFormat()->Format($sDate);
 						}
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
+						{
+							return AttributeDate::GetFormat()->Format($sDate);
+						}
 					}
 					catch (Exception $e)
 					{
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
index ce084e6a7..0aaf5ca49 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
@@ -19,6 +19,7 @@
 
 namespace Combodo\iTop\Portal\Twig;
 
+use AttributeDate;
 use Twig\Extension\AbstractExtension;
 
 use AttributeDateTime;
@@ -76,6 +77,10 @@ class AppExtension extends AbstractExtension
 					{
 						return AttributeDateTime::GetFormat()->Format($sDate);
 					}
+					if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
+					{
+						return AttributeDate::GetFormat()->Format($sDate);
+					}
 				}
 				catch (Exception $e)
 				{
diff --git a/sources/application/TwigBase/Twig/Extension.php b/sources/application/TwigBase/Twig/Extension.php
index 1d90f0822..65d4a1005 100644
--- a/sources/application/TwigBase/Twig/Extension.php
+++ b/sources/application/TwigBase/Twig/Extension.php
@@ -7,6 +7,7 @@
 namespace Combodo\iTop\Application\TwigBase\Twig;
 
 
+use AttributeDate;
 use AttributeDateTime;
 use AttributeText;
 use Combodo\iTop\Application\UI\Base\iUIBlock;
@@ -56,6 +57,10 @@ class Extension
 						{
 							return AttributeDateTime::GetFormat()->Format($sDate);
 						}
+						if (preg_match('@^\d\d\d\d-\d\d-\d\d$@', trim($sDate)))
+						{
+							return AttributeDate::GetFormat()->Format($sDate);
+						}
 					}
 					catch (Exception $e)
 					{