diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 588461306..92a3027c5 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -1,4 +1,8 @@
 {block name="no-return-functions"}{/block}
+{assign var="company_name" value="{config key="company_name"}"}
+{if not $company_name}
+    {assign var="company_name" value="{intl l='Thelia V2'}"}
+{/if}
 <!doctype html>
 <!--
  ______   __  __     ______     __         __     ______
@@ -31,14 +35,14 @@ GNU General Public License : http://www.gnu.org/licenses/
     <meta charset="utf-8">
 
     {* Page Title *}
-    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{config key="company_name"}{/strip}{/block}</title>
+    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$company_name}{/strip}{/block}</title>
 
     {* Meta Tags *}
     <meta name="generator" content="{intl l='Thelia V2'}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     {block name="meta"}
-        <meta name="description" content="">
+        <meta name="description" content="{$company_name}">
         <meta name="robots" content="noindex,nofollow">
     {/block}
 
@@ -84,7 +88,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="{navigate to="index"}">{config key="company_name"}</a>
+                <a class="navbar-brand" href="{navigate to="index"}">{$company_name}</a>
             </div>
 
             <!-- Place everything within .nav-collapse to hide it until above 768px -->
@@ -144,8 +148,8 @@ GNU General Public License : http://www.gnu.org/licenses/
     <header class="container" role="banner">
         <div class="header">
             <h1 class="logo">
-                <a href="{navigate to="index"}" title="{config key="company_name"}">
-                    {images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{config key="company_name"}">{/images}
+                <a href="{navigate to="index"}" title="{$company_name}">
+                    {images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$company_name}">{/images}
                 </a>
             </h1>
 
@@ -348,7 +352,7 @@ GNU General Public License : http://www.gnu.org/licenses/
                     <section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
                         <div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
                         <div class="block-content">
-                            <meta itemprop="name" content="{config key="company_name"}">
+                            <meta itemprop="name" content="{$company_name}">
                             <ul>
                                 <li class="contact-address">
                                     <address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
