diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py
index 7002961fd21..87bb3ebd37a 100644
--- a/addons/resource/models/resource.py
+++ b/addons/resource/models/resource.py
@@ -699,8 +699,8 @@ class ResourceCalendarLeaves(models.Model):
     date_from = fields.Datetime('Start Date', required=True)
     date_to = fields.Datetime('End Date', required=True)
     tz = fields.Selection(
-        _tz_get, string='Timezone', default=lambda self: self._context.get('tz', self.env.user.tz or 'UTC'),
-        help="Timezone used when encoding the leave. It is used to correctly"
+        _tz_get, string='Timezone', default=lambda self: self._context.get('tz') or self.env.user.tz or 'UTC',
+        help="Timezone used when encoding the leave. It is used to correctly "
              "localize leave hours when computing time intervals.")
     resource_id = fields.Many2one(
         "resource.resource", 'Resource',
diff --git a/doc/cla/individual/novawish.md b/doc/cla/individual/novawish.md
new file mode 100644
index 00000000000..7cb30078983
--- /dev/null
+++ b/doc/cla/individual/novawish.md
@@ -0,0 +1,11 @@
+Vietnam, 2018-02-10
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Duc Dao duc.dd@komit-consulting.com https://github.com/novawish