diff --git a/apps/output/views.py b/apps/output/views.py
index 6d5986ff..7ee4fe0c 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -355,7 +355,7 @@ def generate_custom_dummy_programs(channel_id, channel_name, now, num_days, cust
     except pytz.exceptions.UnknownTimeZoneError:
         logger.warning(f"Unknown timezone: {timezone_value}, defaulting to UTC")
         source_tz = pytz.utc
-    
+
     # Parse output timezone if provided (for display purposes)
     output_tz = None
     if output_timezone_value:
@@ -510,7 +510,7 @@ def generate_custom_dummy_programs(channel_id, channel_name, now, num_days, cust
     if time_info:
         hour_24 = time_info['hour']
         minute = time_info['minute']
-        
+
         # If output_timezone is specified, convert the display time to that timezone
         if output_tz:
             # Create a datetime in the source timezone
diff --git a/frontend/src/components/forms/DummyEPG.jsx b/frontend/src/components/forms/DummyEPG.jsx
index 21103770..0268ee31 100644
--- a/frontend/src/components/forms/DummyEPG.jsx
+++ b/frontend/src/components/forms/DummyEPG.jsx
@@ -42,6 +42,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
         time_pattern: '',
         date_pattern: '',
         timezone: 'US/Eastern',
+        output_timezone: '',
         program_duration: 180,
         sample_title: '',
         title_template: '',
@@ -192,6 +193,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
             custom.timezone ||
             custom.timezone_offset?.toString() ||
             'US/Eastern',
+          output_timezone: custom.output_timezone || '',
           program_duration: custom.program_duration || 180,
           sample_title: custom.sample_title || '',
           title_template: custom.title_template || '',
@@ -757,7 +759,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
             </Box>
           )}
 
-          <Group position="right" mt="md">
+          <Group justify="flex-end" mt="md">
             <Button variant="default" onClick={onClose}>
               Cancel
             </Button>