diff --git a/app/models/user.rb b/app/models/user.rb
index d97b38b..0fc7405 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -512,8 +512,7 @@ class User < Principal
     if time_zone.nil?
       Date.today
     else
-      # TODO replace with time_zone.today
-      Time.now.in_time_zone(time_zone).to_date
+      time_zone.today
     end
   end