diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index 2f5cbef6..e60d3991 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -94,7 +94,9 @@ module Admin
     end
 
     def comment
-      comment = Comment.build_from(@event, current_user.id, comment_params)
+      comment = Comment.new(comment_params)
+      comment.commentable = @event
+      comment.user_id = current_user.id
       comment.save!
       if !params[:parent].nil?
         comment.move_to_child_of(params[:parent])
diff --git a/app/views/admin/events/_nested_comments.html.haml b/app/views/admin/events/_nested_comments.html.haml
index de0044d7..0c97a3f0 100644
--- a/app/views/admin/events/_nested_comments.html.haml
+++ b/app/views/admin/events/_nested_comments.html.haml
@@ -6,10 +6,10 @@
     %div
       %a.pull-right.comment-reply-link{href: "#"} Reply
       .comment-reply
-        = form_tag "#{comment_admin_conference_program_event_path(@conference.short_title, comment.commentable_id)}", method: :post do
+        = semantic_form_for :comment, url:  "#{comment_admin_conference_program_event_path(@conference.short_title, comment.commentable_id)}", method: :post do |f|
+          = f.input :body
           %input{name: "parent", type: "hidden", value: "#{comment.id}"}
           %input{name: "authenticity_token", type: "hidden", value: "#{form_authenticity_token}"}
-          %textarea{name: "comment"}
           %button.btn.btn-primary.pull-right{name: "button", type: "submit"} Add Reply
   - comment.children.each do |child|
     = render "nested_comments", comment: child, padding: 50
diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml
index 4e51b312..5c66f543 100644
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@@ -147,10 +147,11 @@
     %ul.media
       %div
         .row-fluid
-          = form_tag(comment_admin_conference_program_event_path(@conference.short_title, @event.id), method: :post) do
-            = text_area_tag(:comment, '')
-            = submit_tag 'Add Comment', class: 'btn btn-primary pull-right'
+          = semantic_form_for :comment, url: comment_admin_conference_program_event_path(@conference.short_title, @event.id), method: :post do |f|
+            = f.input :body
+            = f.submit 'Add Comment', class: 'btn btn-primary pull-right'
+        %br
         %br
         - @comments.each do |comment|
           %div
-            = render "nested_comments", comment: comment, padding: 0
+            = render partial: 'nested_comments', locals: { comment: comment, padding: 0}