diff --git a/src/ApiPlatform/HandleAttachmentsUploadsProcessor.php b/src/ApiPlatform/HandleAttachmentsUploadsProcessor.php
index e2397a61..8f62f02d 100644
--- a/src/ApiPlatform/HandleAttachmentsUploadsProcessor.php
+++ b/src/ApiPlatform/HandleAttachmentsUploadsProcessor.php
@@ -59,7 +59,7 @@ final class HandleAttachmentsUploadsProcessor implements ProcessorInterface
             //Reset the upload data
             $data->setUpload(null);
 
-            $this->attachmentSubmitHandler->handleFormSubmit($data, $upload);
+            $this->attachmentSubmitHandler->handleUpload($data, $upload);
         }
 
         $result = $this->persistProcessor->process($data, $operation, $uriVariables, $context);
diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index 9f43d07d..a29dc179 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -24,6 +24,7 @@ namespace App\Controller\AdminPages;
 
 use App\DataTables\LogDataTable;
 use App\Entity\Attachments\Attachment;
+use App\Entity\Attachments\AttachmentUpload;
 use App\Entity\Base\AbstractDBElement;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\Base\AbstractPartsContainingDBElement;
@@ -175,16 +176,10 @@ abstract class BaseAdminController extends AbstractController
                 $attachments = $form['attachments'];
                 foreach ($attachments as $attachment) {
                     /** @var FormInterface $attachment */
-                    $options = [
-                        'secure_attachment' => $attachment['secureFile']->getData(),
-                        'download_url' => $attachment['downloadURL']->getData(),
-                    ];
-
                     try {
-                        $this->attachmentSubmitHandler->handleFormSubmit(
+                        $this->attachmentSubmitHandler->handleUpload(
                             $attachment->getData(),
-                            $attachment['file']->getData(),
-                            $options
+                            AttachmentUpload::fromAttachmentForm($attachment)
                         );
                     } catch (AttachmentDownloadException $attachmentDownloadException) {
                         $this->addFlash(
@@ -270,10 +265,9 @@ abstract class BaseAdminController extends AbstractController
                 ];
 
                 try {
-                    $this->attachmentSubmitHandler->handleFormSubmit(
+                    $this->attachmentSubmitHandler->handleUpload(
                         $attachment->getData(),
-                        $attachment['file']->getData(),
-                        $options
+                        AttachmentUpload::fromAttachmentForm($attachment)
                     );
                 } catch (AttachmentDownloadException $attachmentDownloadException) {
                     $this->addFlash(
diff --git a/src/Controller/PartController.php b/src/Controller/PartController.php
index 91d4c3eb..0c5be411 100644
--- a/src/Controller/PartController.php
+++ b/src/Controller/PartController.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\DataTables\LogDataTable;
+use App\Entity\Attachments\AttachmentUpload;
 use App\Entity\Parts\Category;
 use App\Entity\Parts\Footprint;
 use App\Entity\Parts\Manufacturer;
@@ -301,13 +302,9 @@ class PartController extends AbstractController
             $attachments = $form['attachments'];
             foreach ($attachments as $attachment) {
                 /** @var FormInterface $attachment */
-                $options = [
-                    'secure_attachment' => $attachment['secureFile']->getData(),
-                    'download_url' => $attachment['downloadURL']->getData(),
-                ];
 
                 try {
-                    $this->attachmentSubmitHandler->handleFormSubmit($attachment->getData(), $attachment['file']->getData(), $options);
+                    $this->attachmentSubmitHandler->handleUpload($attachment->getData(), AttachmentUpload::fromAttachmentForm($attachment));
                 } catch (AttachmentDownloadException $attachmentDownloadException) {
                     $this->addFlash(
                         'error',
diff --git a/src/Entity/Attachments/Attachment.php b/src/Entity/Attachments/Attachment.php
index a3f0988a..bb4310c3 100644
--- a/src/Entity/Attachments/Attachment.php
+++ b/src/Entity/Attachments/Attachment.php
@@ -36,7 +36,6 @@ use App\ApiPlatform\DocumentedAPIProperty;
 use App\ApiPlatform\Filter\EntityFilter;
 use App\ApiPlatform\Filter\LikeFilter;
 use App\ApiPlatform\HandleAttachmentsUploadsProcessor;
-use App\EntityListeners\AttachmentUploadListener;
 use App\Repository\AttachmentRepository;
 use App\EntityListeners\AttachmentDeleteListener;
 use Doctrine\DBAL\Types\Types;
diff --git a/src/Entity/Attachments/AttachmentUpload.php b/src/Entity/Attachments/AttachmentUpload.php
index 45ef72ab..f2b042b7 100644
--- a/src/Entity/Attachments/AttachmentUpload.php
+++ b/src/Entity/Attachments/AttachmentUpload.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace App\Entity\Attachments;
 
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -54,4 +55,23 @@ class AttachmentUpload
         public readonly ?bool $becomePreviewIfEmpty = true,
     ) {
     }
+
+    /**
+     * Creates an AttachmentUpload object from an Attachment FormInterface
+     * @param  FormInterface  $form
+     * @return AttachmentUpload
+     */
+    public static function fromAttachmentForm(FormInterface $form): AttachmentUpload
+    {
+        if (!$form->has('file')) {
+            throw new \InvalidArgumentException('The form does not have a file field. Is it an attachment form?');
+        }
+
+        return new self(
+            file: $form->get('file')->getData(),
+            downloadUrl: $form->get('downloadURL')->getData(),
+            private: $form->get('secureFile')->getData()
+        );
+
+    }
 }
\ No newline at end of file
diff --git a/src/Services/Attachments/AttachmentSubmitHandler.php b/src/Services/Attachments/AttachmentSubmitHandler.php
index 2128b8a3..a88921e9 100644
--- a/src/Services/Attachments/AttachmentSubmitHandler.php
+++ b/src/Services/Attachments/AttachmentSubmitHandler.php
@@ -186,7 +186,7 @@ class AttachmentSubmitHandler
      *
      * @return Attachment The attachment with the new filename (same instance as passed $attachment)
      */
-    public function handleFormSubmit(Attachment $attachment, ?AttachmentUpload $upload): Attachment
+    public function handleUpload(Attachment $attachment, ?AttachmentUpload $upload): Attachment
     {
         if ($upload === null) {
             $upload = $attachment->getUpload();
@@ -333,7 +333,7 @@ class AttachmentSubmitHandler
      *
      * @return Attachment The attachment with the new filepath
      */
-    protected function downloadURL(Attachment $attachment, array $secureAttachment): Attachment
+    protected function downloadURL(Attachment $attachment, bool $secureAttachment): Attachment
     {
         //Check if we are allowed to download files
         if (!$this->allow_attachments_downloads) {
diff --git a/src/Services/UserSystem/UserAvatarHelper.php b/src/Services/UserSystem/UserAvatarHelper.php
index 22690db5..a694fa77 100644
--- a/src/Services/UserSystem/UserAvatarHelper.php
+++ b/src/Services/UserSystem/UserAvatarHelper.php
@@ -25,6 +25,7 @@ namespace App\Services\UserSystem;
 
 use App\Entity\Attachments\Attachment;
 use App\Entity\Attachments\AttachmentType;
+use App\Entity\Attachments\AttachmentUpload;
 use App\Entity\Attachments\UserAttachment;
 use App\Entity\UserSystem\User;
 use App\Services\Attachments\AttachmentSubmitHandler;
@@ -156,11 +157,10 @@ class UserAvatarHelper
             }
 
             $attachment->setAttachmentType($attachment_type);
-            //$user->setMasterPictureAttachment($attachment);
         }
 
         //Handle the upload
-        $this->submitHandler->handleFormSubmit($attachment, $file);
+        $this->submitHandler->handleUpload($attachment, new AttachmentUpload(file: $file));
 
         //Set attachment as master picture
         $user->setMasterPictureAttachment($attachment);