diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index bb680aeac..b91428f6c 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -27,6 +27,7 @@
     <forms>
         <form name="thelia.customer.creation" class="Thelia\Form\CustomerCreation"/>
         <form name="thelia.customer.modification" class="Thelia\Form\CustomerModification"/>
+        <form name="thelia.customer.login" class="Thelia\Form\CustomerLogin"/>
         <form name="thelia.admin.login" class="Thelia\Form\AdminLogin"/>
     </forms>
 
@@ -120,8 +121,9 @@
             <tag name="thelia.parser.register_plugin"/>
         </service>
 
-        <service id="smarty.url.module" class="Thelia\Core\Template\Smarty\Plugins\UrlGenerator" >
+        <service id="smarty.url.module" class="Thelia\Core\Template\Smarty\Plugins\UrlGenerator" scope="request">
             <tag name="thelia.parser.register_plugin"/>
+            <argument type="service" id="request"/>
         </service>
 
         <service id="smarty.plugin.security" class="Thelia\Core\Template\Smarty\Plugins\Security"  scope="request">
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
index 28fd8e4cf..cd19576b1 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
@@ -69,11 +69,17 @@ class Security implements SmartyPluginInterface
    		$permissions = $this->_explode($params['permissions']);
 
    		if (! $this->securityContext->isGranted($roles, $permissions)) {
-   			throw new AuthenticationException(
+   			$ex = new AuthenticationException(
    					sprintf("User not granted for roles '%s', permissions '%s' in context '%s'.",
    							implode(',', $roles), implode(',', $permissions), $context
    					)
    			);
+
+   			if (! empty($params['login_tpl'])) {
+   				$ex->setLoginTemplate($params['login_tpl']);
+   			}
+
+   			throw $ex;
    		}
 
    		return '';
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
index adcee9579..cef25cc33 100644
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
@@ -1,5 +1,4 @@
 <?php
-use Thelia\Tools\URL;
 /*************************************************************************************/
 /*                                                                                   */
 /*      Thelia	                                                                     */
@@ -27,10 +26,18 @@ namespace Thelia\Core\Template\Smarty\Plugins;
 use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
 use Thelia\Core\Template\Smarty\SmartyPluginInterface;
 use Thelia\Tools\URL;
+use Thelia\Core\HttpFoundation\Request;
 
 class UrlGenerator implements SmartyPluginInterface
 {
-    /**
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+	/**
      * Process url generator function
      *
      * @param  array $params
@@ -42,7 +49,49 @@ class UrlGenerator implements SmartyPluginInterface
     	// the path to process
    		$path =trim($params['path']);
 
-   		return URL::absoluteUrl($path);
+   		return URL::absoluteUrl($path, $this->getArgsFromParam($params));
+     }
+
+     /**
+      * Process view url generator function
+      *
+      * @param  array $params
+      * @param  unknown $smarty
+      * @return string no text is returned.
+      */
+     public function generateViewUrlFunction($params, &$smarty)
+     {
+     	// the path to process
+     	$view = trim($params['view']);
+
+     	return URL::viewUrl($view, $this->getArgsFromParam($params));
+     }
+
+     /**
+      * Get URL parameters array from a comma separated list or arguments in the
+      * parameters.
+      *
+      * @param array $params Smarty function params
+      * @return array the parameters array (either emply, of valued)
+      */
+     private function getArgsFromParam($params) {
+
+     	if (isset($params['args']))
+     		return explode($params['args'], ',');
+
+     	return array();
+     }
+
+     /**
+      * Process view url generator function
+      *
+      * @param  array $params
+      * @param  unknown $smarty
+      * @return string no text is returned.
+      */
+     public function generateReturnToUrl($params, &$smarty)
+     {
+		return URL::absoluteUrl($this->request->getSession()->getReturnToUrl());
      }
 
     /**
@@ -53,7 +102,9 @@ class UrlGenerator implements SmartyPluginInterface
     public function getPluginDescriptors()
     {
         return array(
-            new SmartyPluginDescriptor('function', 'url', $this, 'generateUrlFunction')
+            new SmartyPluginDescriptor('function', 'url', $this, 'generateUrlFunction'),
+            new SmartyPluginDescriptor('function', 'viewurl', $this, 'generateViewUrlFunction'),
+            new SmartyPluginDescriptor('function', 'return_to_url', $this, 'generateReturnToUrl')
         );
     }
 }
diff --git a/core/lib/Thelia/Tools/URL.php b/core/lib/Thelia/Tools/URL.php
index b1c8964d4..ae30d7280 100644
--- a/core/lib/Thelia/Tools/URL.php
+++ b/core/lib/Thelia/Tools/URL.php
@@ -32,7 +32,6 @@ class URL
      *
      * @param string         $path         the relative path
      * @param mixed          $parameters    An array of parameters
-     * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
      *
      * @return string The generated URL
      */
@@ -54,4 +53,18 @@ class URL
 
     	return $base . $queryString;
     }
+
+	/**
+	 * Returns the Absolute URL to a view
+     *
+     * @param string         $viewName      the view name (e.g. login for login.html)
+     * @param mixed          $parameters    An array of parameters
+     *
+     * @return string The generated URL
+     */
+     public static function viewUrl($viewName, array $parameters = array()) {
+     	$path = sprintf("%s?view=%s", ConfigQuery::read('base_url', '/'), $viewName);
+
+     	return self::absoluteUrl($path, $parameters);
+     }
 }