diff --git a/flextype/core/Entries.php b/flextype/core/Entries.php
index 606fa412..12b2a8ce 100755
--- a/flextype/core/Entries.php
+++ b/flextype/core/Entries.php
@@ -14,6 +14,9 @@ use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Expr\Comparison;
 use Flextype\Component\Filesystem\Filesystem;
 use Flextype\Component\Arr\Arr;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
+use Flextype\Component\Session\Session;
 use function array_replace_recursive;
 use function ltrim;
 use function md5;
@@ -435,8 +438,16 @@ class Entries
         if (! Filesystem::has($entry_dir)) {
             // Try to create directory for new entry
             if (Filesystem::createDir($entry_dir)) {
+
                 // Check if new entry file exists
                 if (! Filesystem::has($entry_file = $entry_dir . '/entry.md')) {
+
+                    $data['uuid']         = Uuid::uuid4()->toString();
+                    $data['published_at'] = date($this->flextype->registry->get('settings.date_format'), time());
+                    $data['created_at']   = date($this->flextype->registry->get('settings.date_format'), time());
+                    $data['published_by'] = (Session::exists('uuid') ? Session::get('uuid') : '');
+                    $data['created_by']   = (Session::exists('uuid') ? Session::get('uuid') : '');
+
                     return Filesystem::write($entry_file, Parser::encode($data, 'frontmatter'));
                 }
 
diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index d7374018..c3b335df 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -206,11 +206,6 @@ class EntriesController extends Controller
                 $data_from_post['title']        = $data['title'];
                 $data_from_post['template']     = $template;
                 $data_from_post['fieldset']     = $data['fieldset'];
-                $data_from_post['published_at'] = date($this->registry->get('settings.date_format'), time());
-                $data_from_post['created_at']   = date($this->registry->get('settings.date_format'), 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) {