diff --git a/lib/keila_web/live/form_edit_live.ex b/lib/keila_web/live/form_edit_live.ex
index a0e8a8bd..f3af949f 100644
--- a/lib/keila_web/live/form_edit_live.ex
+++ b/lib/keila_web/live/form_edit_live.ex
@@ -43,6 +43,9 @@ defmodule KeilaWeb.FormEditLive do
         mode: :embed,
         changeset: Ecto.Changeset.change(%Keila.Contacts.Contact{})
       })
+      |> Phoenix.HTML.Safe.to_iodata()
+      |> Floki.parse_fragment!()
+      |> Floki.raw_html(pretty: true)
 
     socket
     |> assign(:form_preview, form_preview)
diff --git a/lib/keila_web/templates/form/edit_live.html.heex b/lib/keila_web/templates/form/edit_live.html.heex
index 835d1c9b..3c62fb0a 100644
--- a/lib/keila_web/templates/form/edit_live.html.heex
+++ b/lib/keila_web/templates/form/edit_live.html.heex
@@ -198,7 +198,7 @@
         <%= if @form_preview.settings.csrf_disabled do %>
             <h2 class="mt-4">Form HTML</h2>
             <div class="flex items-start gap-4">
-                <textarea class="w-full bg-gray-800" rows="2" x-ref="form-html"><%= @embed %></textarea>
+                <textarea class="w-full bg-gray-800 text-sm" rows="5" x-ref="form-html"><%= @embed %></textarea>
                 <button class="button" @click.prevent="$refs['form-html'].select(); document.execCommand('copy'); showClipboardMessage = true; setTimeout(() => showClipboardMessage = false, 1000)">
                     <%= gettext("Copy") %>
                 </button>
diff --git a/lib/keila_web/views/form_view.ex b/lib/keila_web/views/form_view.ex
index dfe28143..201b486e 100644
--- a/lib/keila_web/views/form_view.ex
+++ b/lib/keila_web/views/form_view.ex
@@ -12,7 +12,7 @@ defmodule KeilaWeb.FormView do
 
     form_for(
       changeset,
-      Routes.form_path(KeilaWeb.Endpoint, :submit, form.id),
+      Routes.form_url(KeilaWeb.Endpoint, :submit, form.id),
       [class: @form_classes, style: form_styles, csrf_token: csrf_enabled?],
       fn f ->
         [