diff --git a/api/api.go b/api/api.go
index f44c7a75..a139d5fd 100644
--- a/api/api.go
+++ b/api/api.go
@@ -149,28 +149,14 @@ func apiImageContentPost(w http.ResponseWriter, r *http.Request, u *models.User)
 		log.Error().Err(err).Msg("Failed to parse image UUID")
 		http.Error(w, "Failed to parse image UUID", http.StatusBadRequest)
 	}
-	// Read first 8 bytes to check PNG signature
-	filepath := fmt.Sprintf("%s/%s.photo", userfile.UserFilesDirectory, imageUUID.String())
-
-	// Create file in configured directory
-	dst, err := os.Create(filepath)
+	err = userfile.ImageFileContentWrite(imageUUID, r.Body)
 	if err != nil {
-		log.Printf("Failed to create image file %s: %v", filepath, err)
-		http.Error(w, "Unable to create file", http.StatusInternalServerError)
+		render.Render(w, r, errRender(err))
 		return
 	}
-	defer dst.Close()
-
-	// Copy rest of request body to file
-	_, err = io.Copy(dst, r.Body)
-	if err != nil {
-		http.Error(w, "Unable to save file", http.StatusInternalServerError)
-		return
-	}
-
 	w.WriteHeader(http.StatusOK)
 	log.Printf("Saved image file %s\n", imageUUID)
-	fmt.Fprintf(w, "PNG uploaded successfully to %s", filepath)
+	fmt.Fprintf(w, "PNG uploaded successfully")
 }
 
 func apiMosquitoSource(w http.ResponseWriter, r *http.Request, u *models.User) {
diff --git a/userfile/userfile.go b/userfile/userfile.go
index d33c05ff..7d5660ba 100644
--- a/userfile/userfile.go
+++ b/userfile/userfile.go
@@ -41,3 +41,23 @@ func AudioFileContentWrite(audioUUID uuid.UUID, body io.Reader) error {
 	log.Printf("Saved audio content to %s\n", filepath)
 	return nil
 }
+func ImageFileContentPathRaw(uid string) string {
+	return fmt.Sprintf("%s/%s.raw", UserFilesDirectory, uid)
+}
+func ImageFileContentWrite(uid uuid.UUID, body io.Reader) error {
+	filepath := ImageFileContentPathRaw(uid.String())
+
+	// Create file in configured directory
+	dst, err := os.Create(filepath)
+	if err != nil {
+		return fmt.Errorf("Failed to create image file %s: %w", filepath, err)
+	}
+	defer dst.Close()
+
+	// Copy rest of request body to file
+	_, err = io.Copy(dst, body)
+	if err != nil {
+		return fmt.Errorf("Unable to save file %s: %w", filepath, err)
+	}
+	return nil
+}