diff --git a/app/templates/common/macros.html b/app/templates/common/macros.html
index 6ad3a4c..5ca6bf3 100644
--- a/app/templates/common/macros.html
+++ b/app/templates/common/macros.html
@@ -75,7 +75,7 @@
 {% endmacro %}
 
 {% macro timestamp(unix_ts) -%}
-<span class="timestamp" data-utc="{{ unix_ts }}">{{ unix_ts | ts_datetime('%Y-%m-%d %H:%M')}} <abbr title="Server Time">ST</abbr></span>
+<span class="timestamp" data-utc="{{ unix_ts }}" data-init="convertTimestamps">{{ unix_ts | ts_datetime('%Y-%m-%d %H:%M')}} <abbr title="Server Time">ST</abbr></span>
 {%- endmacro %}
 
 {% macro babycode_editor_component(ta_name, ta_placeholder="Post body", optional=False, prefill="", banned_tags=[]) %}
@@ -121,7 +121,7 @@
 
 {% macro babycode_editor_form(ta_name, prefill = "", cancel_url="", endpoint="") %}
 {% set save_button_text = "Post reply" if not cancel_url else "Save" %}
-<form class="post-edit-form" method="post" action={{ endpoint }}>
+<form class="post-edit-form" method="post" {%- if endpoint %}action={{ endpoint }}{% endif %}>
   {{babycode_editor_component(ta_name, prefill = prefill)}}
   {% if not cancel_url %}
     <span>