diff --git a/src/files.rs b/src/files.rs
index 4c6b76c..b161776 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -459,7 +459,10 @@ mod tests {
     #[test]
     fn directory_traversal_test() {
         let base = env::temp_dir();
-        assert_eq!(None, is_valid_full_path(&base, &PathBuf::from("../"), false));
+        assert_eq!(
+            None,
+            is_valid_full_path(&base, &PathBuf::from("../"), false)
+        );
         assert_eq!(None, is_valid_full_path(&base, &PathBuf::from(".."), false));
         assert_eq!(
             None,
diff --git a/src/main.rs b/src/main.rs
index 95aa587..9c0b402 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,11 +26,12 @@ use actix_web::{
     web::{self, BufMut, BytesMut},
     App, HttpRequest, HttpResponse, HttpServer, Responder,
 };
+use chrono::Utc;
 use diesel::sqlite::Sqlite;
 use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
 use rayon::prelude::*;
 
-use log::{debug, error, info};
+use log::{debug, error, info, warn};
 
 use crate::auth::login;
 use crate::data::*;
@@ -165,8 +166,21 @@ async fn upload_image(
                 let mut file = File::create(full_path).unwrap();
                 file.write_all(&file_content).unwrap();
             } else {
-                error!("File already exists: {:?}", full_path);
-                return HttpResponse::BadRequest().body("File already exists");
+                warn!("File already exists: {:?}", full_path);
+
+                let new_path = format!(
+                    "{:?}_{}.{:?}",
+                    full_path.file_stem(),
+                    Utc::now(),
+                    full_path
+                        .extension()
+                        .expect("Uploaded file should have an extension")
+                );
+                let mut file = File::create(new_path).unwrap();
+                file.write_all(&file_content).unwrap();
+
+                create_thumbnails();
+                return HttpResponse::Ok().finish();
             }
         } else {
             error!("Invalid path for upload: {:?}", full_path);
@@ -175,6 +189,8 @@ async fn upload_image(
     } else {
         return HttpResponse::BadRequest().body("No file body read");
     }
+
+    create_thumbnails();
     HttpResponse::Ok().finish()
 }
 
@@ -217,7 +233,8 @@ async fn stream_video(
     debug!("Playlist: {}", playlist);
 
     // Extract video playlist dir to dotenv
-    if !playlist.starts_with("tmp") && is_valid_full_path(&app_state.base_path, playlist, false).is_some()
+    if !playlist.starts_with("tmp")
+        && is_valid_full_path(&app_state.base_path, playlist, false).is_some()
     {
         HttpResponse::BadRequest().finish()
     } else if let Ok(file) = NamedFile::open(playlist) {