diff --git a/lib/WebGUI/Macro/ConvertUTCToTZ.pm b/lib/WebGUI/Macro/ConvertUTCToTZ.pm
index 4098980c4..afaa30ec7 100644
--- a/lib/WebGUI/Macro/ConvertUTCToTZ.pm
+++ b/lib/WebGUI/Macro/ConvertUTCToTZ.pm
@@ -60,16 +60,9 @@ time - time component formatted as HH:MM:SS
 sub process {
     my ( $session, $toTZ, $format, $date, $time ) = @_;
 
-    my $uTZ     = 'UTC';
-    my $uFormat = '%F %T';
+    my $uTZ     = $session->user->profileField("timeZone");
+    my $uFormat = $session->user->profileField("dateFormat");
 
-    # Change defaults only if we have a user defined and they have these set.
-    eval { $session->user };
-    unless ($@) {
-        $uTZ     = $session->user->profileField("timeZone");
-        $uFormat = $session->user->profileField("dateFormat");
-    }
-    
     $toTZ   ||= $uTZ;
     $format ||= $uFormat;