diff --git a/comments.php b/comments.php
index b486662..00b9790 100644
--- a/comments.php
+++ b/comments.php
@@ -174,6 +174,12 @@ class CommentsPlugin extends Plugin
                 $email = filter_var(urldecode($post['email']), FILTER_SANITIZE_STRING);
                 $title = filter_var(urldecode($post['title']), FILTER_SANITIZE_STRING);
 
+                $user = $this->grav['user'];
+                if ($user->authenticated) {
+                    $name = $user->fullname;
+                    $email = $user->email;
+                }
+
                 /** @var Language $language */
                 $language = $this->grav['language'];
                 $lang = $language->getLanguage();
diff --git a/templates/partials/comments.html.twig b/templates/partials/comments.html.twig
index cbb75fa..4a161ed 100644
--- a/templates/partials/comments.html.twig
+++ b/templates/partials/comments.html.twig
@@ -11,9 +11,21 @@
             {% if field.evaluateDefault %}
                 {% set value = evaluate(field.evaluateDefault) %}
             {% endif %}
-            <div>
-                {% include "forms/fields/#{field.type}/#{field.type}.html.twig" %}
-            </div>
+            {% if grav.user.authenticated %}
+                {% if field.name == 'name' %}
+                    <input type="hidden" name="{{field.name}}" value="{{grav.user.fullname}}">
+                {% elseif field.name == 'email' %}
+                    <input type="hidden" name="{{field.name}}" value="{{grav.user.email}}">
+                {% else %}
+                    <div>
+                        {% include "forms/fields/#{field.type}/#{field.type}.html.twig" %}
+                    </div>                
+                {% endif %}
+            {% else %}
+                <div>
+                    {% include "forms/fields/#{field.type}/#{field.type}.html.twig" %}
+                </div>
+            {% endif %}
         {% endfor %}
 
         <div class="buttons">