diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 6c2173b1b40..f94ca7cf30a 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -47,7 +47,7 @@ $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS))
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
 	$filtert=$user->id;
 }
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 8a5c698724f..fbd63e4006b 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -57,7 +57,7 @@ $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS))
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
 	$filtert=$user->id;
 }
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 1ca9af2b251..a6a11d04a99 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -48,7 +48,7 @@ $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = 0;
 
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->AGENDA_ALL_CALENDARS))
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
 	$filtert=$user->id;
 }
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 487ebfce7f8..be0469d34d3 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1011,6 +1011,7 @@ create table llx_c_email_templates
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   module          varchar(32),                    -- Nom du module en rapport avec le modele
   type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
+  lang            varchar(32),
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
diff --git a/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_template.sql
index 532ecd995eb..ac424f31208 100644
--- a/htdocs/install/mysql/tables/llx_c_email_template.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_template.sql
@@ -23,6 +23,7 @@ create table llx_c_email_template
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   module          varchar(32),                    -- Nom du module en rapport avec le modele
   type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
+  lang            varchar(6),
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,