diff --git a/app/Console/Commands/InfoCommand.php b/app/Console/Commands/InfoCommand.php
index d84b477a7..2ae8079e9 100644
--- a/app/Console/Commands/InfoCommand.php
+++ b/app/Console/Commands/InfoCommand.php
@@ -29,7 +29,6 @@ class InfoCommand extends Command
             ['Panel Version', config('app.version')],
             ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
-            ['Unique Identifier', config('panel.service.author')],
         ], 'compact');
 
         $this->output->title('Application Configuration');
diff --git a/app/Http/Controllers/Admin/Eggs/EggController.php b/app/Http/Controllers/Admin/Eggs/EggController.php
index 2c71e6e85..5485d1235 100644
--- a/app/Http/Controllers/Admin/Eggs/EggController.php
+++ b/app/Http/Controllers/Admin/Eggs/EggController.php
@@ -56,6 +56,7 @@ class EggController extends Controller
     {
         $data = $request->validated();
         $data['docker_images'] = $this->normalizeDockerImages($data['docker_images'] ?? null);
+        $data['author'] = $request->user()->email;
 
         $egg = $this->creationService->handle($data);
         $this->alert->success(trans('admin/eggs.notices.egg_created'))->flash();
diff --git a/app/Services/Eggs/EggCreationService.php b/app/Services/Eggs/EggCreationService.php
index e1f6672a8..e4ab3dde5 100644
--- a/app/Services/Eggs/EggCreationService.php
+++ b/app/Services/Eggs/EggCreationService.php
@@ -24,7 +24,6 @@ class EggCreationService
 
         return Egg::query()->create(array_merge($data, [
             'uuid' => Uuid::uuid4()->toString(),
-            'author' => config('panel.service.author'),
         ]));
     }
 }