diff --git a/defaults/main.yml b/defaults/main.yml
index 4ae0b2e..acf79df 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,3 +5,4 @@ sogo_submission_server: 'smtp://localhost:587/?tls=YES&tlsVerifyMode=allowInsecu
 sogo_imap_server:       'imap://localhost:143/'
 sogo_sieve_server:      'sieve://localhost:4190/'
 sogo_ldap_server:       'ldapi://'
+sogo_timezone:          UTC
diff --git a/templates/sogo.conf.j2 b/templates/sogo.conf.j2
index f85a0b4..a106ae1 100644
--- a/templates/sogo.conf.j2
+++ b/templates/sogo.conf.j2
@@ -8,7 +8,7 @@
   SOGoMailingMechanism = smtp;
   SOGoSMTPServer = "{{sogo_submission_server}}";
   SOGoSMTPAuthenticationType = PLAIN;
-  SOGoTimeZone = UTC;
+  SOGoTimeZone = {{sogo_timezone}};
   SOGoSentFolderName = INBOX;
   SOGoTrashFolderName = Trash;
   SOGoDraftsFolderName = Drafts;
@@ -37,10 +37,10 @@
       IDFieldName = mail;
       UIDFieldName = mail;
       baseDN = "{{sogo_ldap_base_dn}}";
-{% if sogo_ldap_bind_dn %}
+{% if sogo_ldap_bind_dn is defined %}
 			bindDN = "{{sogo_ldap_bind_dn}}";
 {% endif %}
-{% if sogo_ldap_bind_password %}
+{% if sogo_ldap_bind_password is defined %}
 			bindPassword = "{{sogo_ldap_bind_password}}";
 {% endif %}
       canAuthenticate = YES;
@@ -56,10 +56,10 @@
       IDFieldName = mail;
       UIDFieldName = mail;
       baseDN = "{{sogo_ldap_base_dn}}";
-{% if sogo_ldap_bind_dn %}
+{% if sogo_ldap_bind_dn is defined %}
 			bindDN = "{{sogo_ldap_bind_dn}}";
 {% endif %}
-{% if sogo_ldap_bind_password %}
+{% if sogo_ldap_bind_password is defined %}
 			bindPassword = "{{sogo_ldap_bind_password}}";
 {% endif %}
       canAuthenticate = NO;