diff --git a/themes/default/breadcrumb.tpl b/themes/default/breadcrumb.tpl
index 573a0ccc3..8d7d18358 100644
--- a/themes/default/breadcrumb.tpl
+++ b/themes/default/breadcrumb.tpl
@@ -29,7 +29,7 @@
 <div class="breadcrumb">
 	<a href="{$base_dir}" title="{l s='return to Home'}"><img src="{$img_dir}icon/home.gif" height="26" width="26" alt="{l s='Home'}" /></a>
 	{if isset($path) AND $path}
-		<span class="navigation-pipe" {if isset($category) && $category->id_category == 1}style="display:none;"{/if}>{$navigationPipe|escape:html:'UTF-8'}</span>
+		<span class="navigation-pipe" {if isset($category) && isset($category->id_category) && $category->id_category == 1}style="display:none;"{/if}>{$navigationPipe|escape:html:'UTF-8'}</span>
 		{if !$path|strpos:'span'}
 			<span class="navigation_page">{$path}</span>
 		{else}
diff --git a/themes/default/cms.tpl b/themes/default/cms.tpl
index e4fdbe5fb..2e7d313d1 100644
--- a/themes/default/cms.tpl
+++ b/themes/default/cms.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if isset($cms) && ($content_only == 0)}
+{if ($content_only == 0)}
 	{include file="$tpl_dir./breadcrumb.tpl"}
 {/if}
 {if isset($cms) && !isset($category)}
@@ -45,7 +45,7 @@
 	</div>
 {elseif isset($category)}
 	<div class="block-cms">
-		<h1><a href="{if $category->id eq 1}{$base_dir}{else}{$link->getCategoryLink($category->id, $category->link_rewrite)}{/if}">{$category->name|escape:'htmlall':'UTF-8'}</a></h1>
+		<h1><a href="{if $category->id eq 1}{$base_dir}{else}{$link->getCMSCategoryLink($category->id, $category->link_rewrite)}{/if}">{$category->name|escape:'htmlall':'UTF-8'}</a></h1>
 		{if isset($sub_category) & !empty($sub_category)}	
 			<h4>{l s='List of sub categories in %s:' sprintf=$category->name}</h4>
 			<ul class="bullet">