diff --git a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
index 6e95e3de9c..f41f971b90 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
@@ -72,6 +72,7 @@ $container->setParameter('combodo.portal.instance.conf', $aPortalConf);
 
 //TODO: The following needs to be refactored
 // Session messages
+// Note: We keep this system instead of following the Symfony system to make it simpler for extension developers to use them accross the admin. console and the portal.
 $aAllMessages = array();
 if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_messages'])))
 {
@@ -81,7 +82,7 @@ if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_mess
 		$aRanks = array();
 		foreach ($aMessageObjectData as $sMessageId => $aMessageData)
 		{
-			$sMsgClass = 'alert alert-';
+			$sMsgClass = 'alert alert-dismissible alert-';
 			switch ($aMessageData['severity'])
 			{
 				case 'info':
@@ -95,10 +96,10 @@ if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_mess
 					$sMsgClass .= 'success';
 					break;
 			}
-			$aObjectMessages[] = array('cssClass' => $sMsgClass, 'message' => $aMessageData['message']);
+			$aObjectMessages[] = array('css_classes' => $sMsgClass, 'message' => $aMessageData['message']);
 			$aRanks[] = $aMessageData['rank'];
 		}
-		unset($_SESSION['obj_messages'][$sMessageKey]);
+		//unset($_SESSION['obj_messages'][$sMessageKey]);
 		array_multisort($aRanks, $aObjectMessages);
 		foreach ($aObjectMessages as $aObjectMessage)
 		{
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
index 38f5987dbb..658f972722 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
@@ -329,8 +329,11 @@
                     {% if app['combodo.current_user.session_messages']|length > 0 %}
 						<section class="row" id="session-messages">
 							<div class="col-xs-12">
-                                {% for sessionMessage in app['combodo.current_user.session_messages'] %}
-									<div class="{{ sessionMessage['cssClass'] }}">{{ sessionMessage['message'] }}</div>
+                                {% for aSessionMessage in app['combodo.current_user.session_messages'] %}
+									<div class="{{ aSessionMessage['css_classes'] }}">
+										<button type="button" class="close" data-dismiss="alert" aria-label="X"><span class="fas fa-times"></span></button>
+										{{ aSessionMessage['message'] }}
+									</div>
                                 {% endfor %}
 							</div>
 						</section>