diff --git a/src/User/Action/Command/SaveUserDownloadPreferencesCommand.php b/src/User/Action/Command/SaveUserDownloadPreferencesCommand.php
new file mode 100644
index 0000000..2764f29
--- /dev/null
+++ b/src/User/Action/Command/SaveUserDownloadPreferencesCommand.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\User\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserDownloadPreferencesCommand implements CommandInterface
+{
+    public function __construct(
+        public string $movie_folder,
+    ) {}
+}
\ No newline at end of file
diff --git a/src/User/Action/Handler/SaveUserDownloadPreferencesHandler.php b/src/User/Action/Handler/SaveUserDownloadPreferencesHandler.php
new file mode 100644
index 0000000..7f7d446
--- /dev/null
+++ b/src/User/Action/Handler/SaveUserDownloadPreferencesHandler.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\User\Action\Handler;
+
+use App\User\Action\Command\SaveUserMediaPreferencesCommand;
+use App\User\Action\Result\SaveUserDownloadPreferencesResult;
+use App\User\Action\Result\SaveUserMediaPreferencesResult;
+use App\User\Framework\Entity\User;
+use App\User\Framework\Entity\UserPreference;
+use App\User\Framework\Repository\PreferencesRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface as R;
+use Symfony\Bundle\SecurityBundle\Security;
+
+/** @implements HandlerInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserDownloadPreferencesHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly PreferencesRepository $preferenceRepository,
+        private readonly Security $token,
+    ) {}
+
+    public function handle(C $command): R
+    {
+        /** @var User $user */
+        $user = $this->token->getUser();
+
+        foreach ($command as $preference => $value) {
+            if ($user->hasUserPreference($preference)) {
+                $user->updateUserPreference($preference, $value);
+                $this->entityManager->flush();
+                continue;
+            }
+
+            $preference = $this->preferenceRepository->find($preference);
+
+            $user->addUserPreference(
+                (new UserPreference())
+                    ->setUser($user)
+                    ->setPreference($preference)
+                    ->setPreferenceValue($value)
+            );
+        }
+
+        $this->entityManager->flush();
+
+        return new SaveUserDownloadPreferencesResult($user->getDownloadPreferences());
+    }
+}
diff --git a/src/User/Action/Input/SaveUserDownloadPreferencesInput.php b/src/User/Action/Input/SaveUserDownloadPreferencesInput.php
new file mode 100644
index 0000000..de62efb
--- /dev/null
+++ b/src/User/Action/Input/SaveUserDownloadPreferencesInput.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\User\Action\Input;
+
+use App\User\Action\Command\SaveUserDownloadPreferencesCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Attribute\SourceSecurity;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<SaveUserDownloadPreferencesInput, SaveUserDownloadPreferencesCommand> */
+class SaveUserDownloadPreferencesInput implements InputInterface
+{
+    public function __construct(
+        #[SourceSecurity]
+        public mixed $userId,
+
+        #[SourceRequest('movie_folder', nullify: true)]
+        public bool $movieFolder,
+    ) {}
+
+    public function toCommand(): C
+    {
+        return new SaveUserDownloadPreferencesCommand(
+            $this->movieFolder,
+        );
+    }
+}
diff --git a/src/User/Action/Result/SaveUserDownloadPreferencesResult.php b/src/User/Action/Result/SaveUserDownloadPreferencesResult.php
new file mode 100644
index 0000000..6da6178
--- /dev/null
+++ b/src/User/Action/Result/SaveUserDownloadPreferencesResult.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Action\Result;
+
+use Doctrine\Common\Collections\Collection;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface */
+class SaveUserDownloadPreferencesResult implements ResultInterface
+{
+    public function __construct(
+        public array $downloadPreferences,
+    ) {}
+}
\ No newline at end of file
diff --git a/src/User/Framework/Controller/Web/PreferencesController.php b/src/User/Framework/Controller/Web/PreferencesController.php
index a5c7ca4..a52c965 100644
--- a/src/User/Framework/Controller/Web/PreferencesController.php
+++ b/src/User/Framework/Controller/Web/PreferencesController.php
@@ -5,7 +5,9 @@ declare(strict_types=1);
 namespace App\User\Framework\Controller\Web;
 
 use Aimeos\Map;
+use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
+use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Framework\Entity\User;
 use App\User\Framework\Entity\UserPreference;
@@ -27,6 +29,7 @@ class PreferencesController extends AbstractController
         private readonly PreferencesRepository $preferencesRepository,
         private readonly SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
         private readonly HubInterface $hub,
+        private readonly SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ) {}
     #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
@@ -54,8 +57,9 @@ class PreferencesController extends AbstractController
         SaveUserMediaPreferencesInput $input,
     ): Response
     {
-        $userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
-        $userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
+        $this->saveUserMediaPreferencesHandler->handle($input->toCommand());
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
@@ -75,7 +79,8 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }
@@ -83,11 +88,11 @@ class PreferencesController extends AbstractController
     #[Route('/user/preferences/download', 'app_save_download_preferences', methods: ['POST'])]
     public function saveDownloadPreferences(
         Request $request,
-        SaveUserMediaPreferencesInput $input,
+        SaveUserDownloadPreferencesInput $input,
     ): Response
     {
-        $userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
-        $userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
+        $downloadPreferences = $this->saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
@@ -97,7 +102,7 @@ class PreferencesController extends AbstractController
             $this->renderView('broadcast/Alert.stream.html.twig', [
                 'alert_id' => uniqid(),
                 'title' => 'Success',
-                'message' => 'Your media preferences have been saved.',
+                'message' => 'Your download preferences have been saved.',
             ])
         ));
 
@@ -107,7 +112,8 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }
diff --git a/templates/user/preferences.html.twig b/templates/user/preferences.html.twig
index 5d7d229..4d9a164 100644
--- a/templates/user/preferences.html.twig
+++ b/templates/user/preferences.html.twig
@@ -69,11 +69,13 @@
 
     <twig:Card title="Download Preferences" class="w-full">
         <p class="text-gray-50 mb-2">Change how your downloads are stored.</p>
-        <form id="media_preferences" class="flex flex-col" name="media_preferences" method="post" action="{{ path('app_save_download_preferences') }}">
-            <div class="flex flex-row gap-2">
-                <input type="checkbox" name="movie_folder" id="movie_folder" {{ downloadPreferences['movie_folder'].getPreferenceValue() == true ? 'checked' }} />
+        <form id="download_preferences" class="flex flex-col" name="download_preferences" method="post" action="{{ path('app_save_download_preferences') }}">
+            <div class="flex flex-row gap-2 mb-2">
+                <input type="hidden" name="movie_folder" id="movie_folder_hidden" value="0" />
+                <input type="checkbox" name="movie_folder" id="movie_folder" value="1" {{ downloadPreferences['movie_folder'].getPreferenceValue() == true ? 'checked' }} />
                 <label class="text-gray-50" for="movie_folder">Store movies in a new directory?</label>
             </div>
+            <button class="px-1.5 py-1 max-w-20 rounded-md bg-green-600 text-white" type="submit">Submit</button>
         </form>
     </twig:Card>
 </div>