diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig
index 860457e..1ec0690 100644
--- a/templates/fediplan/schedule.html.twig
+++ b/templates/fediplan/schedule.html.twig
@@ -396,6 +396,7 @@
     <script src="{{ asset('js/moment.js') }}"></script>
     <script src="{{ asset('js/emojionearea.js') }}"></script>
     <script type="text/javascript">
+
         $(function() {
             'use strict';
 
@@ -545,14 +546,16 @@
                 searchPosition: "bottom",
                 search: false
             });
-            var timezone;
-
+            let userTimezone;
             if(!!sessionStorage.getItem('timeZone')) {
-                timezone = sessionStorage.getItem('timeZone');
+                userTimezone = sessionStorage.getItem('timeZone');
             } else {
-                timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+                userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
             }
-            $('#compose_timeZone').val(timezone);
+
+
+            $("#compose_scheduled_at").val(new Date(new Date().toString().split('GMT')[0]+' UTC').toISOString().split('.')[0]);
+            $('#compose_timeZone').val(userTimezone);
             $('#compose_timeZone').on('change', function () {
                 sessionStorage.setItem("timeZone", this.value);
             });
diff --git a/templates/fediplan/scheduled.html.twig b/templates/fediplan/scheduled.html.twig
index 4578d5a..dac6a50 100644
--- a/templates/fediplan/scheduled.html.twig
+++ b/templates/fediplan/scheduled.html.twig
@@ -58,7 +58,7 @@
             lang = navigator.language.slice(0,2);
         }
         function convertTZ(date) {
-            return new Intl.DateTimeFormat(lang, { dateStyle: "full" , timeStyle: "long",  timeZone: userTimezone}).format(new Date(date)).toLocaleString();
+            return new Intl.DateTimeFormat(lang, { dateStyle: "full" , timeStyle: "long",  timeZone: userTimezone}).format(new Date(date + " UTC")).toLocaleString();
         }
 
         $(document).ready(function() {