diff --git a/include/class.staff.php b/include/class.staff.php
index 0563d50174c89ad46168215b93d08528d5be0036..99c101f00dff166075aa157af2375dcefea3fd13 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -25,6 +25,7 @@ class Staff {
 
     var $dept;
     var $teams;
+    var $timezone;
     var $stats;
     
     function Staff($var) {
@@ -56,12 +57,10 @@ class Staff {
         if(($time=strtotime($this->ht['passwdreset']?$this->ht['passwdreset']:$this->ht['added'])))
             $this->ht['passwd_change'] = time()-$time; //XXX: check timezone issues.
 
-        /* TODO: Add timezone class
         if($this->ht['timezone_id'])
             $this->ht['tz_offset'] = Timezone::getOffsetById($this->ht['timezone_id']);
         elseif($this->ht['timezone_offset'])
             $this->ht['tz_offset'] = $this->ht['timezone_offset'];
-        */
 
         return ($this->id);
     }
diff --git a/main.inc.php b/main.inc.php
index 155e4c852f6f991eaa14c6892a7454917e27bbea..31b044f4b65b919c375b6f612bb488574154c409 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -102,6 +102,7 @@
     require(INCLUDE_DIR.'class.log.php');
     require(INCLUDE_DIR.'class.mcrypt.php');
     require(INCLUDE_DIR.'class.misc.php');
+    require(INCLUDE_DIR.'class.timezone.php');
     require(INCLUDE_DIR.'class.http.php');
     require(INCLUDE_DIR.'class.nav.php');
     require(INCLUDE_DIR.'class.format.php'); //format helpers