diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 9811052509a..54a91d6ee92 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -401,6 +401,23 @@ $titre=$langs->trans("WebsiteSetup");
 $linkback='<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($titre,$linkback,'title_setup');
 
+// Onglets
+$head=array();
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website.php";
+$head[$h][1] = $langs->trans("WebSites");
+$head[$h][2] = 'website';
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/website_options.php";
+$head[$h][1] = $langs->trans("Options");
+$head[$h][2] = 'options';
+$h++;
+
+dol_fiche_head($head, 'website', '', -1);
+
+
 print $langs->trans("WebsiteSetupDesc").'<br>';
 print "<br>\n";
 
@@ -648,7 +665,9 @@ if ($id)
     }
 }
 
-print '<br>';
+dol_fiche_end();
+
+//print '<br>';
 
 
 llxFooter();
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4f1726a45c6..d3b242840ae 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -206,7 +206,7 @@ function societe_prepare_head(Societe $object)
         $h++;
     }
 
-    if (! empty($conf->website->enabled) && (!empty($user->rights->societe->lire) ))
+    if (! empty($conf->website->enabled) && (! empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire)))
     {
     	$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("WebSiteAccounts");
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index a329661a056..c7cdd65ff4e 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -64,3 +64,5 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
\ No newline at end of file