diff --git a/forum/static/js/forum.js b/forum/static/js/forum.js
index 2477bbe..ac0c95a 100644
--- a/forum/static/js/forum.js
+++ b/forum/static/js/forum.js
@@ -182,7 +182,7 @@ function edit_post(url, post_id, success_message) {
                     success: function (data) {
                         alertify.success(success_message);
 
-                        $("#post_"+post_id).parent().after(data);
+                        $("#post_"+post_id).parent().after(data.html);
                         frm.parent().parent().remove();
                     },
                     error: function(data) {
@@ -344,7 +344,7 @@ function edit_post_answer(url, answer_id, success_message) {
                     success: function (data) {
                         alertify.success(success_message);
 
-                        $("#answer_"+answer_id).parent().after(data);
+                        $("#answer_"+answer_id).parent().after(data.html);
                         frm.parent().parent().remove();
                     },
                     error: function(data) {
diff --git a/forum/templates/forum/forum_form.html b/forum/templates/forum/forum_form.html
index ed6abc3..e11791f 100644
--- a/forum/templates/forum/forum_form.html
+++ b/forum/templates/forum/forum_form.html
@@ -8,6 +8,7 @@
 			{% if field.field.widget.input_type == 'hidden' %}
 	            {% render_field field class='form-control' %}
            	{% elif field.auto_id == 'id_limit_date' %}
+           		<label for="{{ field.auto_id }}">{{ field.label }}</label>
            		<input type="text" class="form-control date-picker"name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" id="{{ field.auto_id }}">
 				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 	        {% else %}
--
libgit2 0.21.2