diff --git a/src/babillard_page.eml.html b/src/babillard_page.eml.html
index ddaffba..7baa444 100644
--- a/src/babillard_page.eml.html
+++ b/src/babillard_page.eml.html
@@ -1,4 +1,11 @@
 let f request =
+
+% let redirect = Dream.to_percent_encoded "/new_thread" in
+% let new_thread_url =
+%   if Option.is_none @@ Dream.session "nick" request then
+%     Format.sprintf "/login?redirect=%s" redirect
+%   else "/new_thread"
+% in
   <script type="text/javascript" src="/assets/js/js_babillard.js" defer="defer"></script>
   <h1>Babillard is love ❤️</h1>
   <br />
@@ -7,17 +14,10 @@ let f request =
       <div id="map"></div>
       <br />
       <button class="btn btn-primary" id="geolocalize">Geolocalize me</button>
-% begin match Dream.session "nick" request with
-% | None ->
-% let redirect = Dream.to_percent_encoded "/new_thread" in
-% ()
-<a class="btn btn-primary" href="/login?redirect=<%s redirect%>">New Thread</a>
-% | Some _ ->
-      <a class="btn btn-primary" href="/new_thread">New Thread</a>
+      <a class="btn btn-primary" href="<%s! new_thread_url %>">New Thread</a>
     </div>
     <div class="col-md-6">
       <div id="thread_preview_div"></div>
       <a id="thread_link"></a>
     </div>
   </div>
-% end;