diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index a2179c45..ad5baa9e 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -201,6 +201,8 @@ class EntriesController extends Controller
                 $data_from_post['published_at'] = time();
                 $data_from_post['created_at']   = time();
                 $data_from_post['uuid']         = Uuid::uuid4()->toString();
+                $data_from_post['published_by'] = Session::get('uuid');
+                $data_from_post['created_by']   = Session::get('uuid');
 
                 // Predefine data values based on selected fieldset
                 foreach ($fieldset['sections'] as $key => $section) {
@@ -340,6 +342,8 @@ class EntriesController extends Controller
         Arr::delete($_data, 'save_entry');
         Arr::delete($_data, 'id');
 
+        $_data['published_by'] = Session::get('uuid');
+
         $data = array_merge($entry, $_data);
 
         if ($this->entries->update(
@@ -772,6 +776,8 @@ class EntriesController extends Controller
             // Data from POST
             $data = $request->getParsedBody();
 
+            $data['published_by'] = Session::get('uuid');
+
             // Update entry
             if ($this->entries->update($id, Parser::decode($data['data'], $data['parser']))) {
                 $this->flash->addMessage('success', __('admin_message_entry_changes_saved'));
@@ -791,6 +797,8 @@ class EntriesController extends Controller
             Arr::delete($data, 'csrf_name');
             Arr::delete($data, 'action');
 
+            $data['published_by'] = Session::get('uuid');
+
             // Fetch entry
             $entry = $this->entries->fetch($id);
             Arr::delete($entry, 'slug');