diff --git a/src/Entity/LogSystem/AbstractLogEntry.php b/src/Entity/LogSystem/AbstractLogEntry.php
index c4107bae..d7ab547b 100644
--- a/src/Entity/LogSystem/AbstractLogEntry.php
+++ b/src/Entity/LogSystem/AbstractLogEntry.php
@@ -129,7 +129,7 @@ abstract class AbstractLogEntry extends AbstractDBElement
     ];
 
     /** @var User The user which has caused this log entry
-     * @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User")
+     * @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User", fetch="EAGER")
      * @ORM\JoinColumn(name="id_user", nullable=false)
      */
     protected $user;
diff --git a/src/Repository/LogEntryRepository.php b/src/Repository/LogEntryRepository.php
index 27a0b4f8..9ff420fa 100644
--- a/src/Repository/LogEntryRepository.php
+++ b/src/Repository/LogEntryRepository.php
@@ -26,7 +26,11 @@ namespace App\Repository;
 
 use App\Entity\Base\AbstractDBElement;
 use App\Entity\LogSystem\AbstractLogEntry;
+use App\Entity\LogSystem\ElementCreatedLogEntry;
+use App\Entity\LogSystem\ElementEditedLogEntry;
+use App\Entity\UserSystem\User;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 
 class LogEntryRepository extends EntityRepository
 {
@@ -34,8 +38,9 @@ class LogEntryRepository extends EntityRepository
     {
         //Emulate a target element criteria by splitting it manually in the needed criterias
         if (isset($criteria['target']) && $criteria['target'] instanceof AbstractDBElement) {
+            /** @var AbstractDBElement $element */
             $element = $criteria['target'];
-            $criteria['target_id'] = $element;
+            $criteria['target_id'] = $element->getID();
             $criteria['target_type'] = AbstractLogEntry::targetTypeClassToID(get_class($element));
             unset($criteria['target']);
         }
@@ -93,4 +98,49 @@ class LogEntryRepository extends EntityRepository
 
         return $this->getEntityManager()->find($class, $id);
     }
+
+    protected function getLastUser(AbstractDBElement $element, string $class)
+    {
+        $qb = $this->createQueryBuilder('log');
+        $qb->select('log')
+            //->where('log INSTANCE OF App\Entity\LogSystem\ElementEditedLogEntry')
+            ->where('log INSTANCE OF ' . $class)
+            ->andWhere('log.target_type = :target_type')
+            ->andWhere('log.target_id = :target_id')
+            ->orderBy('log.timestamp', 'DESC');
+
+        $qb->setParameters([
+                               'target_type' => AbstractLogEntry::targetTypeClassToID(get_class($element)),
+                               'target_id' => $element->getID()
+                           ]);
+
+        $query = $qb->getQuery();
+        $query->setMaxResults(1);
+        /** @var AbstractLogEntry[] $results */
+        $results = $query->execute();
+        if (isset($results[0])) {
+            return $results[0]->getUser();
+        }
+        return null;
+    }
+
+    /**
+     * Returns the last user that has edited the given element.
+     * @param  AbstractDBElement  $element
+     * @return User|null A user object, or null if no user could be determined.
+     */
+    public function getLastEditingUser(AbstractDBElement $element): ?User
+    {
+        return $this->getLastUser($element, ElementEditedLogEntry::class);
+    }
+
+    /**
+     * Returns the user that has created the given element.
+     * @param  AbstractDBElement  $element
+     * @return User|null A user object, or null if no user could be determined.
+     */
+    public function getCreatingUser(AbstractDBElement $element): ?User
+    {
+        return $this->getLastUser($element, ElementCreatedLogEntry::class);
+    }
 }
diff --git a/src/Twig/LastUserExtension.php b/src/Twig/LastUserExtension.php
new file mode 100644
index 00000000..9aa3fa1e
--- /dev/null
+++ b/src/Twig/LastUserExtension.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ * Copyright (C) 2019 - 2020 Jan Böhmer (https://github.com/jbtronics)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+namespace App\Twig;
+
+
+use App\Entity\Base\AbstractDBElement;
+use App\Entity\LogSystem\AbstractLogEntry;
+use Doctrine\ORM\EntityManagerInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+class LastUserExtension extends AbstractExtension
+{
+    private $em;
+    private $repo;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+        $this->repo = $em->getRepository(AbstractLogEntry::class);
+    }
+
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction('getLastEditingUser', [$this->repo, 'getLastEditingUser']),
+            new TwigFunction('getCreatingUser', [$this->repo, 'getCreatingUser'])
+        ];
+    }
+}
\ No newline at end of file
diff --git a/templates/AdminPages/_info.html.twig b/templates/AdminPages/_info.html.twig
index acae0ae0..a6b01460 100644
--- a/templates/AdminPages/_info.html.twig
+++ b/templates/AdminPages/_info.html.twig
@@ -1,3 +1,5 @@
+{% import "helper.twig" as helper %}
+
 <div class="form-group row">
     <label class="col-form-label col-md-3">{% trans %}id.label{% endtrans %}</label>
     <div class="col-md-9">
@@ -10,8 +12,8 @@
     <div class="col-md-9">
         <p class="form-control-plaintext">
 
-            {% if date(entity.addedDate) > date('1900/01/01') %}
-                {{ entity.addedDate | format_datetime("long") }}
+            {% if entity.id is not null and date(entity.addedDate) > date('1900/01/01') %}
+                {{ helper.date_user_combination(entity, false, "long") }}
             {% else %}
                 -
             {% endif %}
@@ -23,8 +25,8 @@
     <label class="col-form-label col-md-3">{% trans %}lastModified{% endtrans %}</label>
     <div class="col-md-9">
         <p class="form-control-plaintext">
-            {% if date(entity.lastModified) > date('1900/01/01') %}
-                {{ entity.lastModified | format_datetime("long") }}
+            {% if entity.id is not null and date(entity.lastModified) > date('1900/01/01') %}
+                {{ helper.date_user_combination(entity, true, "long") }}
             {% else %}
                 -
             {% endif %}
diff --git a/templates/Parts/info/_extended_infos.html.twig b/templates/Parts/info/_extended_infos.html.twig
index d84552c5..5f4889f0 100644
--- a/templates/Parts/info/_extended_infos.html.twig
+++ b/templates/Parts/info/_extended_infos.html.twig
@@ -7,11 +7,31 @@
         <td>{{ part.addedDate | format_datetime("long")}}</td>
     </tr>
 
+    <tr>
+        <td>{% trans %}user.creating_user{% endtrans %}</td>
+        <td>{% if is_granted('show_users', part) %}
+                {{ getCreatingUser(part).fullName(true) ?? 'Unknown'|trans }}
+            {% else %}
+                {% trans %}accessDenied{% endtrans %}
+            {% endif %}
+        </td>
+    </tr>
+
     <tr> {# Last modified date #}
         <td>{% trans %}lastModified{% endtrans %}</td>
         <td>{{ part.lastModified | format_datetime("long")}}</td>
     </tr>
 
+    <tr>
+        <td>{% trans %}user.last_editing_user{% endtrans %}</td>
+        <td>{% if is_granted('show_users', part) %}
+                {{ getLastEditingUser(part).fullName(true) ?? 'Unknown'|trans }}
+            {% else %}
+                {% trans %}accessDenied{% endtrans %}
+            {% endif %}
+        </td>
+    </tr>
+
     <tr> {# ID #}
         <td>{% trans %}id.label{% endtrans %}</td>
         <td>{{ part.iD }} ({{ part.iDString}})</td>
diff --git a/templates/Parts/info/_sidebar.html.twig b/templates/Parts/info/_sidebar.html.twig
index ca635b08..2d3f715a 100644
--- a/templates/Parts/info/_sidebar.html.twig
+++ b/templates/Parts/info/_sidebar.html.twig
@@ -2,11 +2,11 @@
 
 <div class="mb-3">
 <span class="text-muted" title="{% trans %}lastModified{% endtrans %}">
-    <i class="fas fa-history fa-fw"></i> {{ part.lastModified | format_datetime("short") }}
+    <i class="fas fa-history fa-fw"></i>  {{ helper.date_user_combination(part, true) }}
 </span>
     <br>
     <span class="text-muted mt-1" title="{% trans %}createdAt{% endtrans %}">
-    <i class="fas fa-calendar-plus fa-fw"></i> {{ part.addedDate | format_datetime("short") }}
+    <i class="fas fa-calendar-plus fa-fw"></i> {{ helper.date_user_combination(part, false) }}
 </span>
 </div>
 
diff --git a/templates/helper.twig b/templates/helper.twig
index 616bb6e7..9b2be38e 100644
--- a/templates/helper.twig
+++ b/templates/helper.twig
@@ -88,4 +88,27 @@
     {% else %}
         <i class="fas fa-times-circle fa-fw" title="{% trans %}No{% endtrans %}"></i>
     {% endif %}
+{% endmacro %}
+
+{% macro date_user_combination(entity, lastModified, datetime_format = "short") %}
+    {% if lastModified == true %}
+        {{ entity.lastModified | format_datetime(datetime_format) }}
+    {% else %}
+        {{ entity.addedDate | format_datetime(datetime_format) }}
+    {% endif %}
+    {% if is_granted('show_users', entity) %}
+        {% if lastModified == true %}
+            {% set user = getLastEditingUser(entity) %}
+        {% else %}
+            {% set user = getCreatingUser(entity) %}
+        {% endif %}
+
+        {% if user is not null %}
+            {% if user.fullName is not empty %}
+                <a href="{{ url('user_info', {"id": user.id}) }}" title="@{{ user.name }}"><i>({{ user.fullName }})</i></a>
+            {% else %}
+                <a href="{{ url('user_info', {"id": user.id}) }}" title="@{{ user.name }}"><i>(@{{ user.name }})</i></a>
+            {% endif %}
+        {% endif %}
+    {% endif %}
 {% endmacro %}
\ No newline at end of file