diff --git a/app/templates/task.html b/app/templates/task.html
index 071c3c7..d9246a5 100644
--- a/app/templates/task.html
+++ b/app/templates/task.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
 {% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %}
+{% set createdTime = createdTime.astimezone(ZoneInfo(current_user.timezone)) %}
 
 {% block content %}
     <span><h1>{% block title %} {{ task.title }}  {% endblock %}</h1></span>
diff --git a/app/templates/tasks.html b/app/templates/tasks.html
index 9e39ed7..f403efd 100644
--- a/app/templates/tasks.html
+++ b/app/templates/tasks.html
@@ -6,6 +6,7 @@
         {% for task in tasks %}
             {% set createdTime = datetime.fromtimestamp(task.created_timestamp) %}
             {% set createdTime = datetime.strptime(str(createdTime), '%Y-%m-%d %H:%M:%S') %}
+            {% set createdTime = createdTime.astimezone(ZoneInfo(current_user.timezone)) %}
             <div>
                 <a href="/task/{{ task.id }}">
                 <p><b>{{ task.title }}</b> </p>