diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index 7657b6c82..39dae8303 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -305,7 +305,8 @@ class ActionEmail extends ActionNotification
   			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
   			throw $e;
   		}
-
+		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		
 		if (!is_null($oLog))
 		{
 			// Note: we have to secure this because those values are calculated