diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4670b1..3415666 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 1. [](#improved)
     * Added Japanese translation
     * Move captcha over email [#45](https://github.com/getgrav/grav-plugin-comments/issues/45)
+1. [](#bugfix)
+    * Fix comment form processing
 
 # v1.2.6
 ## 01/09/2017
diff --git a/comments.php b/comments.php
index c6ee298..7a59543 100644
--- a/comments.php
+++ b/comments.php
@@ -187,7 +187,7 @@ class CommentsPlugin extends Plugin
 
         switch ($action) {
             case 'addComment':
-                $post = !empty($_POST) ? $_POST : [];
+                $post = isset($_POST['data']) ? $_POST['data'] : [];
 
                 $lang = filter_var(urldecode($post['lang']), FILTER_SANITIZE_STRING);
                 $path = filter_var(urldecode($post['path']), FILTER_SANITIZE_STRING);
diff --git a/templates/partials/comments.html.twig b/templates/partials/comments.html.twig
index 7528223..e44edef 100644
--- a/templates/partials/comments.html.twig
+++ b/templates/partials/comments.html.twig
@@ -1,4 +1,5 @@
 {% if grav.twig.enable_comments_plugin %}
+    {% set scope = scope ?: 'data.' %}
 
     <h3>{{'PLUGIN_COMMENTS.ADD_COMMENT'|t}}</h3>