diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 796f3fe16..b5103b12d 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -8161,7 +8161,7 @@ class AttributeURL extends AttributeString
 	 * @since 3.0.3 moved from Config to AttributeURL constant
 	 */
 	public const DEFAULT_VALIDATION_PATTERN = /** @lang RegExp */
-		'(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9:%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.,-]*)?(#[a-zA-Z0-9_.-][a-zA-Z0-9+\$_.-]*)?';
+		'(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9:%@+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.,-]*)?(#[a-zA-Z0-9_.-][a-zA-Z0-9+\$_.-]*)?';
 
 	/**
 	 * Useless constructor, but if not present PHP 7.4.0/7.4.1 is crashing :( (N°2329)
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 5560b8ea5..377b562f3 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -7027,7 +7027,7 @@ abstract class MetaModel
 	 * @param array $aParams
 	 * @param bool $bAllowAllData
 	 *
-	 * @return \DBObject
+	 * @return \DBObject|null
 	 * @throws \OQLException
 	 */
 	public static function GetObjectFromOQL($sQuery, $aParams = null, $bAllowAllData = false)
diff --git a/js/components/newsroom-menu.js b/js/components/newsroom-menu.js
index 4c2f22e6a..637ba0cb7 100644
--- a/js/components/newsroom-menu.js
+++ b/js/components/newsroom-menu.js
@@ -327,7 +327,8 @@ $(function()
 				oElem.popover_menu({
 					'toggler': '[data-role="ibo-navigation-menu--notifications-show-all-multiple"]',
 					'position': {
-						'horizontal': "(oTargetPos.left+parseInt(oTargetElem.css('marginLeft'), 10)+(oTargetElem.outerWidth() / 2)-(oElem.outerWidth() / 2))+'px'",
+						'horizontal': "(oTargetPos.left+parseInt(oTargetElem.css('marginLeft'), 10)+(oTargetElem.outerWidth() / 1.5)-(oElem.outerWidth() / 2))+'px'",
+						'vertical': 'above'
 					},
 				});
 
diff --git a/sources/SessionTracker/iSessionHandlerExtension.php b/sources/SessionTracker/iSessionHandlerExtension.php
index ef357b1e0..17cd31776 100644
--- a/sources/SessionTracker/iSessionHandlerExtension.php
+++ b/sources/SessionTracker/iSessionHandlerExtension.php
@@ -5,7 +5,7 @@ namespace Combodo\iTop\SessionTracker;
 	/**
 	 * @experimental for internal use only, subject to change without notice.
 	 *
-     * Do not use this interface in your code.
+	 * Do not use this interface in your code.
 	 *
 	 * @since 3.2.2
 	 */
diff --git a/templates/datamodel/ActionEmail/email-notification-preview.html.twig b/templates/datamodel/ActionEmail/email-notification-preview.html.twig
index 717659f6b..94b2dec1e 100644
--- a/templates/datamodel/ActionEmail/email-notification-preview.html.twig
+++ b/templates/datamodel/ActionEmail/email-notification-preview.html.twig
@@ -3,7 +3,7 @@
 <div id="branding-error-alert-content">
 <div style="display:flex;flex-align: stretch;">
 <div style="margin-right:1em"><span class="fas fa-2x fa-exclamation-triangle"></span></div>
-<div>{{ 'ActionEmail:preview_warning'|dict_s }}<br/>{{ 'ActionEmail:preview_more_info'|dict_format('<a href="https://www.caniemail.com" target="_blank">www.canimeail.com</a>')|raw }}</div>
+<div>{{ 'ActionEmail:preview_warning'|dict_s }}<br/>{{ 'ActionEmail:preview_more_info'|dict_format('<a href="https://www.caniemail.com" target="_blank">www.caniemail.com</a>')|raw }}</div>
 </div>
 </div>
 {% EndUIAlert %}
diff --git a/tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php b/tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
index b44931659..a2b7aed8f 100644
--- a/tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/AttributeURLTest.php
@@ -36,6 +36,7 @@ class AttributeURLTest extends ItopTestCase {
 			'SF URL'                            => ['https://sourceforge.net/p/itop/discussion/customizing-itop/thread/707145b859/?limit=25#f53c', 1],
 			'SF URL anchor starting with digit' => ['https://sourceforge.net/p/itop/discussion/customizing-itop/thread/b0a2d474ba/?limit=25#2b35', 1],
 			'URL param containing commas'       => ['http://mydomain.prtg.com/chart.png?type=graph&width=1500&height=700&hide=2,3,6,7,8,9,10,11,12,13,14&graphstyling=showLegend%3D%271%27+baseFontSize%3D%2715%27&graphid=0&id=34759&username=portaluser&passhash=2353031973', 1],
+			'URL with @ in path segment'        => ['https://calendar.example.com/book/meetingroom42@ex.com/', 1],
 			// 'iTop anchors'                      => ['https://itsm-designer.combodo.com/pages/UI.php?operation=details&class=MigrationAuditCheckXPath&id=106&#ObjectProperties=tab_UIPropertiesTab', 1], // N°5121
 		];
 	}