diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
index 8f6a06347f..150b843fe6 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
+++ b/datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
@@ -207,11 +207,11 @@ $(function()
 									for(var i in oMessages[sMessageType][sFieldId])
 									{
 										var sMessageContent = oMessages[sMessageType][sFieldId][i];
-										// Note: We might want to expose some routes directly in JS to ease their use
-										if(oHelpBlock === null && me.options.session_message_endpoint !== null)
+										if(oHelpBlock === null)
 										{
 											$.post(
-												me.options.session_message_endpoint,
+												// Note: We might want to expose some routes directly in JS to ease their use
+												GetAddSessionMessageUrl(),
 												{
 													sSeverity: sMessageType,
 													sContent: sMessageContent,
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
index f2cb5ed2da..edd26d5a0f 100644
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
@@ -80,7 +80,6 @@
 			{% if form.submit_rule is not null %}submit_rule: {{ form.submit_rule|json_encode|raw }}{% endif %},
 			{% if form.cancel_rule is not null %}cancel_rule: {{ form.cancel_rule|json_encode|raw }}{% endif %},
 			endpoint: "{{ form.renderer.GetEndpoint()|raw }}",
-			session_message_endpoint: "{{ app['url_generator'].generate('p_session_message_add')|raw }}",
 			is_modal: {% if tIsModal == true %}true{% else %}false{% endif %}
 		});
 		
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 1ac1ef6d63..1d02e7397d 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
@@ -407,6 +407,11 @@
 				{
 					return '{{ app['combodo.absolute_url'] }}';
 				};
+				// Note: We might want to expose URLs instead of this kind of stuff... 🤔
+				var GetAddSessionMessageUrl = function()
+				{
+					return '{{ app['url_generator'].generate('p_session_message_add')|raw }}';
+				};
 				// Helper to add a parameter to an url
 				var AddParameterToUrl = function(sUrl, sParamName, sParamValue)
 				{