diff --git a/src/components/pages/Manage/Flameshot.tsx b/src/components/pages/Manage/Flameshot.tsx
index 2d20629..806d7b5 100644
--- a/src/components/pages/Manage/Flameshot.tsx
+++ b/src/components/pages/Manage/Flameshot.tsx
@@ -55,6 +55,12 @@ export default function Flameshot({ user, open, setOpen }) {
       delete extraHeaders['No-JSON'];
     }
 
+    if (values.originalName && values.type === 'upload-file') {
+      extraHeaders['Original-Name'] = 'true';
+    } else {
+      delete extraHeaders['Original-Name'];
+    }
+
     for (const [key, value] of Object.entries(extraHeaders)) {
       curl.push('-H');
       curl.push(`"${key}: ${value}"`);
diff --git a/src/components/pages/Manage/GeneratorModal.tsx b/src/components/pages/Manage/GeneratorModal.tsx
index 10ba641..9312732 100644
--- a/src/components/pages/Manage/GeneratorModal.tsx
+++ b/src/components/pages/Manage/GeneratorModal.tsx
@@ -1,4 +1,17 @@
-import { Box, Button, Checkbox, Code, Group, Modal, NumberInput, Select, Text, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Checkbox,
+  Code,
+  Group,
+  Modal,
+  NumberInput,
+  Select,
+  Stack,
+  Switch,
+  Text,
+  Title,
+} from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { DownloadIcon } from 'components/icons';
 import Link from 'components/Link';
@@ -16,6 +29,7 @@ export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
       wlCompatibility: false,
       wlCompositorNotSupported: false,
       noJSON: false,
+      originalName: false,
     },
   });
 
@@ -71,27 +85,34 @@ export function GeneratorModal({ opened, onClose, title, onSubmit, ...other }) {
           {...form.getInputProps('imageCompression')}
         />
 
-        <Group grow my='md'>
-          <Checkbox
+        <Stack my='md'>
+          <Switch
             label='Zero Width Space'
             description='Use zero width spaces as the file name'
             id='zeroWidthSpace'
             {...form.getInputProps('zeroWidthSpace', { type: 'checkbox' })}
           />
-          <Checkbox
+          <Switch
+            description='Return response as plain text instead of JSON'
+            label='No JSON'
+            id='noJSON'
+            {...form.getInputProps('noJSON', { type: 'checkbox' })}
+          />
+          <Switch
             description='Image will display with embedded metadata'
             label='Embed'
             id='embed'
             disabled={!isUploadFile}
             {...form.getInputProps('embed', { type: 'checkbox' })}
           />
-          <Checkbox
-            description='Return response as plain text instead of JSON'
-            label='No JSON'
-            id='noJSON'
-            {...form.getInputProps('noJSON', { type: 'checkbox' })}
+          <Switch
+            description='Whether or not to show the original name when downloading this specific file. This will not change the name format in the URL.'
+            label='Original Name'
+            id='originalName'
+            disabled={!isUploadFile}
+            {...form.getInputProps('originalName', { type: 'checkbox' })}
           />
-        </Group>
+        </Stack>
 
         {title === 'Flameshot' && (
           <>
diff --git a/src/components/pages/Manage/ShareX.tsx b/src/components/pages/Manage/ShareX.tsx
index a7bcb88..2368640 100644
--- a/src/components/pages/Manage/ShareX.tsx
+++ b/src/components/pages/Manage/ShareX.tsx
@@ -82,6 +82,14 @@ export default function ShareX({ user, open, setOpen }) {
       setConfig(config);
     }
 
+    if (values.originalName && values.type === 'upload-file') {
+      config.Headers['Original-Name'] = 'true';
+      setConfig(config);
+    } else {
+      delete config.Headers['Original-Name'];
+      setConfig(config);
+    }
+
     const pseudoElement = document.createElement('a');
     pseudoElement.setAttribute(
       'href',
diff --git a/src/components/pages/Upload/useUploadOptions.tsx b/src/components/pages/Upload/useUploadOptions.tsx
index 1568d65..68c356e 100644
--- a/src/components/pages/Upload/useUploadOptions.tsx
+++ b/src/components/pages/Upload/useUploadOptions.tsx
@@ -5,7 +5,6 @@ import {
   NumberInput,
   PasswordInput,
   Select,
-  SimpleGrid,
   Stack,
   Switch,
   Title,