diff --git a/crunchy-cli-core/src/cli/archive.rs b/crunchy-cli-core/src/cli/archive.rs
index a551bd1..6e56e81 100644
--- a/crunchy-cli-core/src/cli/archive.rs
+++ b/crunchy-cli-core/src/cli/archive.rs
@@ -58,16 +58,18 @@ pub struct Archive {
     #[arg(help = "Name of the output file")]
     #[arg(long_help = "Name of the output file.\
     If you use one of the following pattern they will get replaced:\n  \
-      {title}          → Title of the video\n  \
-      {series_name}    → Name of the series\n  \
-      {season_name}    → Name of the season\n  \
-      {audio}          → Audio language of the video\n  \
-      {resolution}     → Resolution of the video\n  \
-      {season_number}  → Number of the season\n  \
-      {episode_number} → Number of the episode\n  \
-      {series_id}      → ID of the series\n  \
-      {season_id}      → ID of the season\n  \
-      {episode_id}     → ID of the episode")]
+      {title}                   → Title of the video\n  \
+      {series_name}             → Name of the series\n  \
+      {season_name}             → Name of the season\n  \
+      {audio}                   → Audio language of the video\n  \
+      {resolution}              → Resolution of the video\n  \
+      {padded_season_number}    → Number of the season padded to double digits\n  \
+      {season_number}           → Number of the season\n  \
+      {padded_episode_number}   → Number of the episode padded to double digits\n  \
+      {episode_number}          → Number of the episode\n  \
+      {series_id}               → ID of the series\n  \
+      {season_id}               → ID of the season\n  \
+      {episode_id}              → ID of the episode")]
     #[arg(short, long, default_value = "{title}.mkv")]
     output: String,
 
diff --git a/crunchy-cli-core/src/cli/download.rs b/crunchy-cli-core/src/cli/download.rs
index e13d3f0..4e4eb3c 100644
--- a/crunchy-cli-core/src/cli/download.rs
+++ b/crunchy-cli-core/src/cli/download.rs
@@ -36,16 +36,18 @@ pub struct Download {
     #[arg(help = "Name of the output file")]
     #[arg(long_help = "Name of the output file.\
     If you use one of the following pattern they will get replaced:\n  \
-      {title}          → Title of the video\n  \
-      {series_name}    → Name of the series\n  \
-      {season_name}    → Name of the season\n  \
-      {audio}          → Audio language of the video\n  \
-      {resolution}     → Resolution of the video\n  \
-      {season_number}  → Number of the season\n  \
-      {episode_number} → Number of the episode\n  \
-      {series_id}      → ID of the series\n  \
-      {season_id}      → ID of the season\n  \
-      {episode_id}     → ID of the episode")]
+      {title}                   → Title of the video\n  \
+      {series_name}             → Name of the series\n  \
+      {season_name}             → Name of the season\n  \
+      {audio}                   → Audio language of the video\n  \
+      {resolution}              → Resolution of the video\n  \
+      {padded_season_number}    → Number of the season padded to double digits\n  \
+      {season_number}           → Number of the season\n  \
+      {padded_episode_number}   → Number of the episode padded to double digits\n  \
+      {episode_number}          → Number of the episode\n  \
+      {series_id}               → ID of the series\n  \
+      {season_id}               → ID of the season\n  \
+      {episode_id}              → ID of the episode")]
     #[arg(short, long, default_value = "{title}.ts")]
     output: String,
 
diff --git a/crunchy-cli-core/src/utils/format.rs b/crunchy-cli-core/src/utils/format.rs
index b111dce..c463ea8 100644
--- a/crunchy-cli-core/src/utils/format.rs
+++ b/crunchy-cli-core/src/utils/format.rs
@@ -77,9 +77,26 @@ pub fn format_string(s: String, format: &Format, sanitize: bool) -> String {
         .replace("{series_name}", &sanitize_func(&format.series_name))
         .replace("{season_name}", &sanitize_func(&format.season_title))
         .replace("{audio}", &sanitize_func(&format.audio.to_string()))
-        .replace("{resolution}", &sanitize_func(&format.stream.resolution.to_string()))
-        .replace("{season_number}", &sanitize_func(&format.season_number.to_string()))
-        .replace("{episode_number}", &sanitize_func(&format.number.to_string()))
+        .replace(
+            "{resolution}",
+            &sanitize_func(&format.stream.resolution.to_string()),
+        )
+        .replace(
+            "{padded_season_number}",
+            &sanitize_func(&format!("{:0>2}", format.season_number.to_string())),
+        )
+        .replace(
+            "{season_number}",
+            &sanitize_func(&format.season_number.to_string()),
+        )
+        .replace(
+            "{padded_episode_number}",
+            &sanitize_func(&format!("{:0>2}", format.number.to_string())),
+        )
+        .replace(
+            "{episode_number}",
+            &sanitize_func(&format.number.to_string()),
+        )
         .replace("{series_id}", &sanitize_func(&format.series_id))
         .replace("{season_id}", &sanitize_func(&format.season_id))
         .replace("{episode_id}", &sanitize_func(&format.id))