diff --git a/vedia.rb b/vedia.rb
index 2ca3c3a..e641ded 100644
--- a/vedia.rb
+++ b/vedia.rb
@@ -133,6 +133,7 @@ post '/login' do
     end
     session.clear
     session[:user_id] = user.id
+    session[:timezone] = params[:timezone]
     redirect '/'
   else
     @error = _("Incorrect email or password.")
@@ -140,10 +141,6 @@ post '/login' do
   end
 end
 
-post '/timezone' do
-  session[:timezone] = JSON.parse(request.body.read)['timezone']
-end
-
 get '/reset' do
   erb :reset
 end
@@ -641,12 +638,7 @@ helpers do
   end
 
   def format_date(timestamp)
-    if session[:timezone]
-      "#{TZInfo::Timezone.get(session[:timezone]).to_local(timestamp).strftime('%F')}"
-    else
-      # Otherwise, format_date fails on first page after login. Not sure why...
-      "#{timestamp.strftime('%F')}"
-    end
+    "#{TZInfo::Timezone.get(session[:timezone]).to_local(timestamp).strftime('%F')}"
   end
 
   def format_date_and_time(timestamp)
diff --git a/views/layout.erb b/views/layout.erb
index 2ccbbd8..a5dbe8d 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -15,15 +15,6 @@
     <link rel="stylesheet" href="/bootstrap-icons.css">
     <link rel="stylesheet" href="/style.css">
   </head>
-  <script>
-  fetch('/timezone', {
-    method: 'post',
-    headers: {
-        'Content-Type': 'application/json'
-    },
-    body: JSON.stringify({ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone })
-  });
-  </script>
   <body>
     <div class="container py-4">
 
diff --git a/views/login.erb b/views/login.erb
index 5a5f40c..5af0607 100644
--- a/views/login.erb
+++ b/views/login.erb
@@ -4,7 +4,7 @@
   <p class="alert alert-warning mb-4"><%= @error %></p>
 <% end %>
 
-<form action="/login" method="post" class="mb-5">
+<form action="/login" name="login" method="post" class="mb-5">
   <div class="mb-3">
     <label for="email" class="form-label"><%= _("Email") %></label>
     <input type="text" name="email" class="form-control">
@@ -14,6 +14,11 @@
     <input type="password" name="password" class="form-control">
   </div>
   <button type="submit" class="btn btn-primary"><%= _("Login") %></button>
+  <input type="hidden" name="timezone" value="UTC">
 </form>
 <p><a href="/signup"><%= _("Create account") %></a></p>
 <p><a href="/reset"><%= _("Reset password") %></a></p>
+
+<script>
+document.login.timezone.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
+</script>
diff --git a/views/votes_show_unauthenticated.erb b/views/votes_show_unauthenticated.erb
index 6899784..2d43efe 100644
--- a/views/votes_show_unauthenticated.erb
+++ b/views/votes_show_unauthenticated.erb
@@ -14,4 +14,9 @@
     <input type="password" name="password" class="form-control">
   </div>
   <button type="submit" class="btn btn-primary"><%= _("Login") %></button>
+  <input type="hidden" name="timezone" value="UTC">
 </form>
+
+<script>
+document.login.timezone.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
+</script>
