diff --git a/administrator/components/com_j2store/views/product/tmpl/form_relations.php b/administrator/components/com_j2store/views/product/tmpl/form_relations.php
index d723c416..b42adcb7 100755
--- a/administrator/components/com_j2store/views/product/tmpl/form_relations.php
+++ b/administrator/components/com_j2store/views/product/tmpl/form_relations.php
@@ -98,7 +98,7 @@
                             <?php if($app->isClient('site')):?>
                                 <?php echo isset($related_product->sku) && !empty($related_product->sku) ? $this->escape($related_product->product_name).'('.$this->escape($related_product->sku).')' : $this->escape($related_product->product_name);?>
                             <?php else: ?>
-                                <a href="index.php?option=com_content&task=article.edit&id=<?php echo $related_product->product_source_id;?>" target="_blank">
+                                <a href="<?php echo $related_product->product_edit_url; ?>" target="_blank">
                                     <?php echo isset($related_product->sku) && !empty($related_product->sku) ? $this->escape($related_product->product_name).'('.$this->escape($related_product->sku).')' : $this->escape($related_product->product_name);?>
                                 </a>
                             <?php endif;?>
diff --git a/language/backend/en-GB/en-GB.com_j2store.ini b/language/backend/en-GB/en-GB.com_j2store.ini
index 046ba593..056a05c8 100755
--- a/language/backend/en-GB/en-GB.com_j2store.ini
+++ b/language/backend/en-GB/en-GB.com_j2store.ini
@@ -1075,7 +1075,7 @@ J2STORE_CART_CONTINUE_SHOPPING="Continue Shopping"
 J2STORE_CART_DELETE_ERROR="An error occurred while deleting a cart item"
 J2STORE_CART_QUANTITY_ADJUSTED="Cart item quantity has been adjusted due to availability restrictions"
 J2STORE_CART_ITEM_STOCK_NOT_ENOUGH_STOCK="Sorry, we do not have enough <strong>%s</strong> in stock to fulfill your order (Only %s in stock). Please edit your cart and try again. We apologize for any inconvenience caused."
-J2STORE_CART_ITEM_STOCK_NOT_AVAILABLE="Sorry, "%s" is not in stock. Please edit your cart and try again. We apologize for any inconvenience caused."
+J2STORE_CART_ITEM_STOCK_NOT_AVAILABLE="Sorry, %s is not in stock. Please edit your cart and try again. We apologize for any inconvenience caused."
 J2STORE_CART_ITEM_MAXIMUM_QUANTITY_REACHED="Sorry, maximum order quantity for %s is %s. But you have %s in the cart. Please edit your cart and try again. We apologize for any inconvenience caused."
 J2STORE_CART_ITEM_MINIMUM_QUANTITY_REQUIRED="Sorry, minimum order quantity for %s is %s. You only have %s in the cart. Please edit your cart and try again. We apologize for any inconvenience caused."
 J2STORE_CART_ITEM_UNAVAILABLE_REMOVED="An item which is no longer available was removed from your cart"