diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index acabbb51f..d8e699322 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -163,7 +163,7 @@ trait UrlRewritingTrait {
     public function setRewrittenUrl($locale, $url)
     {
         $currentUrl = $this->getRewrittenUrl($locale);
-        if($currentUrl == $url) {
+        if($currentUrl == $url || null === $url) {
             /* no url update */
             return $this;
         }
diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html
index b74ad29d8..617ba3b2d 100755
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -83,6 +83,7 @@
                                             formAction = "{url path='/admin/products/seo/save'}"
                                             pageUrl = "{url path='/admin/products/update' product_id=$ID}"
                                             closeUrl = $close_url
+                                            current_id = $product_id
                                         }
                                     {/form}
                                 </div>