diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index ce8d9120e..07dc1c5c9 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -322,7 +322,7 @@ sub getDateTimeStart {
     my $self    = shift;
     my $date    = $self->get("startDate");
     my $time    = $self->get("startTime");
-    my $tz      = $self->session->user->profileField("timeZone");
+    my $tz      = $self->session->datetime->getTimeZone;
     
     #$self->session->errorHandler->warn($self->getId.":: Date: $date -- Time: $time");
     if (!$date) {
@@ -361,7 +361,7 @@ sub getDateTimeEnd {
     my $self    = shift;
     my $date    = $self->get("endDate");
     my $time    = $self->get("endTime");
-    my $tz      = $self->session->user->profileField("timeZone");
+    my $tz      = $self->session->datetime->getTimeZone;
     
     #$self->session->errorHandler->warn($self->getId.":: Date: $date -- Time: $time");
     if (!$date) {
@@ -1900,7 +1900,7 @@ sub www_edit {
     my $self        = shift;
     my $session     = $self->session;
     my $form        = $self->session->form;
-    my $tz          = $form->param('timeZone') || $self->get('timeZone') || $session->user->profileField('timeZone');
+    my $tz          = $form->param('timeZone') || $self->get('timeZone') || $session->datetime->getTimeZone;
     my $func        = lc $session->form->param("func");
     my $var         = {};
 
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 0cd7ce898..12ec7ccb9 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -715,7 +715,7 @@ sub getEventsIn {
     $params->{order} = '' if $params->{order} !~ /^(?:time|sequencenumber)/i;
     my $order_by_type = $params->{order} ? lc($params->{order}) : $self->get('sortEventsBy');
 
-    my $tz      = $self->session->user->profileField("timeZone");
+    my $tz      = $self->session->datetime->getTimeZone;
     
     # Warn and return undef if no startDate or endDate
     unless ($start && $end) {
@@ -1302,7 +1302,7 @@ sub viewMonth {
     my $params      = shift;
     my $i18n        = WebGUI::International->new($session,"Asset_Calendar");
     my $var         = $self->getTemplateVars;
-    my $tz          = $session->user->profileField("timeZone");
+    my $tz          = $session->datetime->getTimeZone;
     my $today       = WebGUI::DateTime->new($self->session, time)
                     ->set_time_zone($tz)->toMysqlDate;
     
@@ -1442,7 +1442,7 @@ sub viewWeek {
     my $params  = shift;
     my $i18n    = WebGUI::International->new($session,"Asset_Calendar");
     my $var     = $self->getTemplateVars;
-    my $tz      = $session->user->profileField("timeZone");
+    my $tz      = $session->datetime->getTimeZone;
     my $today   = WebGUI::DateTime->new($self->session, time)->set_time_zone($tz)
                 ->toMysqlDate;
     
@@ -1825,12 +1825,12 @@ sub www_ical {
         $dt_start   
             = WebGUI::DateTime->new($session, 
                 mysql       => $start, 
-                time_zone   => $user->profileField("timeZone")
+                time_zone   => $session->datetime->getTimeZone,
             );
     }
     else {
         $dt_start = WebGUI::DateTime->new($self->session, time);
-        $dt_start->set_time_zone( $user->profileField("timeZone") );
+        $dt_start->set_time_zone( $session->datetime->getTimeZone );
     }
     
     my $dt_end;
@@ -1839,7 +1839,7 @@ sub www_ical {
         $dt_end 
             = WebGUI::DateTime->new($self->session, 
                 mysql       => $end, 
-                time_zone   => $user->profileField("timeZone")
+                time_zone   => $session->datetime->getTimeZone,
             );
     }
     else {
@@ -2009,7 +2009,7 @@ sub www_search {
                     || $user->isInGroup($data->{groupIdEdit})   ) {
                 # Format the date
                 my $dt    = WebGUI::DateTime->new($self->session, $data->{startDate}." ".($data->{startTime}?$data->{startTime}:"00:00:00"));
-                $dt->set_time_zone($self->session->user->profileField("timeZone"))
+                $dt->set_time_zone( $self->session->datetime->getTimeZone )
                     if ($data->{startTime});
             
                 push(@results, {