diff --git a/core/lib/Thelia/Model/RewritingUrl.php b/core/lib/Thelia/Model/RewritingUrl.php
index 9dd826d01..a13777c41 100644
--- a/core/lib/Thelia/Model/RewritingUrl.php
+++ b/core/lib/Thelia/Model/RewritingUrl.php
@@ -2,25 +2,25 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Model\Base\RewritingUrl as BaseRewritingUrl;
 use Thelia\Model\RewritingUrlQuery;
 
 class RewritingUrl extends BaseRewritingUrl {
 
-    public function preSave(ConnectionInterface $con = null)
+    public function postInsert(ConnectionInterface $con = null)
     {
-        if($this->getRedirected() == 0) {
-            //check if rewriting url alredy exists and put redirect to 1
+        if(null !== $this->getRedirected()) {
+            //check if rewriting url alredy exists and put redirect to the new one
             RewritingUrlQuery::create()
                 ->filterByView($this->getView())
                 ->filterByViewId($this->getViewId())
                 ->filterByViewLocale($this->getViewLocale())
+                ->filterByRedirected($this->getId(), Criteria::NOT_IN)
                 ->update(array(
-                    "redirect" => 1
+                    "Redirected" => $this->getId()
                 ));
         }
-
-        return true;
     }
 }
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index c9154a0db..1b9087626 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -55,17 +55,13 @@ trait UrlRewritingTrait {
     public function generateRewrittenUrl($locale)
     {
         if ($this->isNew()) {
-            throw new \RuntimeException(sprintf('Object %s must be save before generating url', $this->getRewrittenUrlViewName()));
+            throw new \RuntimeException(sprintf('Object %s must be saved before generating url', $this->getRewrittenUrlViewName()));
         }
         // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
 
         $this->setLocale($locale);
 
-        $title = $this->getTitle();
-
-        if (null === $title) {
-            throw new \RuntimeException(sprintf('Impossible to generate url if title does not exists for the locale %s', $locale));
-        }
+        $title = $this->getTitle() ?: $this->getRef();
         // Replace all weird characters with dashes
         $string = preg_replace('/[^\w\-~_\.]+/u', '-', $title);
 
@@ -88,7 +84,6 @@ trait UrlRewritingTrait {
                 ->setView($this->getRewrittenUrlViewName())
                 ->setViewId($this->getId())
                 ->setViewLocale($locale)
-                ->setRedirected(0)
                 ->save()
             ;
         }
diff --git a/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php
new file mode 100644
index 000000000..c38773814
--- /dev/null
+++ b/core/lib/Thelia/Tests/Rewriting/ProductRewriteTest.php
@@ -0,0 +1,88 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tests\Rewriting;
+use Thelia\Model\Product;
+use Thelia\Model\ProductQuery;
+
+
+/**
+ * Class ProductRewriteTest
+ * @package Thelia\Tests\Rewriting
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class ProductRewriteTest extends \PHPUnit_Framework_TestCase
+{
+    protected static $productId;
+
+    public static function setUpBeforeClass()
+    {
+        $product = new Product();
+        $product->setRef(sprintf("TestRewrittenProduct%s",uniqid()))
+            ->setPosition(1)
+            ->setVisible(1)
+            ->setLocale('en_US')
+                ->setTitle('My english super Title')
+            ->setLocale('fr_FR')
+                ->setTitle('Mon super titre en français')
+            ->save();
+
+        self::$productId = $product->getId();
+    }
+
+    /**
+     * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl
+     */
+    public function testFrenchRewrittenUrl()
+    {
+        $product = ProductQuery::create()->findPk(self::$productId);
+
+        $rewrittenUrl = $product->generateRewrittenUrl('fr_FR');
+        $this->assertNotNull($rewrittenUrl, "rewritten url can not be null");
+        $this->assertRegExp('/^mon-super-titre-en-français(-[0-9]+)?\.html$/', $rewrittenUrl);
+        //mon-super-titre-en-français-2.html
+    }
+
+    /**
+     * @covers Thelia\Model\Tools\UrlRewritingTrait::generateRewrittenUrl
+     */
+    public function testEnglishRewrittenUrl()
+    {
+        $product = ProductQuery::create()->findPk(self::$productId);
+
+        $rewrittenUrl = $product->generateRewrittenUrl('en_US');
+        $this->assertNotNull($rewrittenUrl, "rewritten url can not be null");
+        $this->assertRegExp('/^my-english-super-title(-[0-9]+)?\.html$/', $rewrittenUrl);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Object product must be saved before generating url
+     */
+    public function testOnNotSavedProduct()
+    {
+        $product = new Product();
+
+        $product->generateRewrittenUrl('fr_FR');
+    }
+}
\ No newline at end of file