diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 912247eb0ff..4583852526a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -676,13 +676,13 @@ function getStructuredData($type, $data = array())
 		$ret .= '{
 			"@context": "https://schema.org",
 			"@type": "Organization",
-			"name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",
-			"url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",
+			"name": "'.dol_escape_json(!empty($data['name']) ? $data['name'] : $companyname).'",
+			"url": "'.dol_escape_json(!empty($data['url']) ? $data['url'] : $url).'",
 			"logo": "'.($data['logo'] ? dol_escape_json($data['logo']) : '/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo)).'",
 			"contactPoint": {
 				"@type": "ContactPoint",
 				"contactType": "Contact",
-				"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
+				"email": "'.dol_escape_json(!empty($data['email']) ? $data['email'] : $mysoc->email).'"
 			}'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= ",\n";
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 9be644e0c16..9a340050d22 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -67,7 +67,7 @@ if (!is_object($weblangs)) {
 if (!is_object($pagelangs)) {
 	$pagelangs = new Translate('', $conf);
 }
-if ($pageid > 0) {
+if (!empty($pageid) && $pageid > 0) {
 	$websitepage->fetch($pageid);
 
 	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index f5a4ec292bd..84a35074805 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -77,10 +77,15 @@ class Website extends CommonObject
 	public $description;
 
 	/**
-	 * @var string Main language of web site
+	 * @var string Main language on 5 chars of web site
 	 */
 	public $lang;
 
+	/**
+	 * @var string Main language on 2 chars of web site
+	 */
+	public $shortlang;
+
 	/**
 	 * @var string List of languages of web site ('fr', 'es_MX', ...)
 	 */