From 34cf89b6be1dac1984e15f79a48e6ae93dc48d5a Mon Sep 17 00:00:00 2001
From: Castle <7586648+MythodeaLoL@users.noreply.github.com>
Date: Mon, 5 Jan 2026 05:20:38 -0300
Subject: [PATCH 1/4] fix(category): add correct category name

- fix category path's
- added override to api key
- added secure select for real category
---
 config.sample.yaml                            |  9 ++-
 .../config/SABnzbdConfigSection.tsx           | 57 ++++++++++++++----
 internal/api/auth_handlers.go                 | 21 +++++++
 internal/api/parsers.go                       | 10 ++++
 internal/api/sabnzbd_handlers.go              | 43 +++++++++++---
 internal/config/manager.go                    | 58 +++++++++++++++++--
 internal/importer/service.go                  | 17 +++++-
 7 files changed, 188 insertions(+), 27 deletions(-)

diff --git a/config.sample.yaml b/config.sample.yaml
index f90330956..09260cf49 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -10,6 +10,7 @@ webdav:
 # REST API configuration
 api:
   prefix: '/api' # API endpoint prefix
+  key_override: '' # 33-char API key override (takes precedence over database key, leave empty to use database)
 
 # Authentication configuration
 auth:
@@ -168,8 +169,12 @@ mount_path: '' # WebDAV mount path, Example: '/mnt/altmount' or '/mnt/unionfs'.
 # SABnzbd-compatible API configuration
 sabnzbd:
   enabled: false # Enable SABnzbd-compatible API
-  complete_dir: '/complete' # The complete directory where the files will be "downloaded"
-  categories: # Download categories (optional)
+  complete_dir: '/' # Base virtual directory (relative to mount point, defaults to root)
+  categories: # Download categories
+    - name: 'Default' # System default category (name cannot be changed)
+      order: 0
+      priority: 0
+      dir: 'complete' # Default directory for uncategorized downloads
     - name: 'movies'
       order: 1
       priority: 0
diff --git a/frontend/src/components/config/SABnzbdConfigSection.tsx b/frontend/src/components/config/SABnzbdConfigSection.tsx
index ffd0bf849..8c02d8043 100644
--- a/frontend/src/components/config/SABnzbdConfigSection.tsx
+++ b/frontend/src/components/config/SABnzbdConfigSection.tsx
@@ -24,6 +24,9 @@ const DEFAULT_NEW_CATEGORY: NewCategoryForm = {
 	dir: "",
 };
 
+const DEFAULT_CATEGORY_NAME = "Default";
+const isDefaultCategory = (categoryName: string) => categoryName === DEFAULT_CATEGORY_NAME;
+
 export function SABnzbdConfigSection({
 	config,
 	onUpdate,
@@ -82,11 +85,11 @@ export function SABnzbdConfigSection({
 		const errors: string[] = [];
 
 		if (data.enabled) {
-			// Validate complete_dir is required and absolute
+			// Validate complete_dir is required and starts with /
 			if (!data.complete_dir?.trim()) {
 				errors.push("Complete directory is required when SABnzbd API is enabled");
 			} else if (!data.complete_dir.startsWith("/")) {
-				errors.push("Complete directory must be an absolute path (starting with /)");
+				errors.push("Complete directory must start with /");
 			}
 
 			// Validate category names are unique
@@ -134,12 +137,27 @@ export function SABnzbdConfigSection({
 	};
 
 	const handleCategoryUpdate = (index: number, updates: Partial<SABnzbdCategory>) => {
+		const category = formData.categories[index];
+		// For Default category, only prevent renaming (allow order, priority, dir changes)
+		if (isDefaultCategory(category.name) && updates.name !== undefined) {
+			// Prevent renaming Default category
+			delete updates.name;
+			if (Object.keys(updates).length === 0) {
+				return;
+			}
+		}
+
 		const categories = [...formData.categories];
 		categories[index] = { ...categories[index], ...updates };
 		updateFormData({ categories });
 	};
 
 	const handleRemoveCategory = (index: number) => {
+		const category = formData.categories[index];
+		// Prevent removing Default category
+		if (isDefaultCategory(category.name)) {
+			return;
+		}
 		const categories = formData.categories.filter((_, i) => i !== index);
 		updateFormData({ categories });
 	};
@@ -149,6 +167,12 @@ export function SABnzbdConfigSection({
 			return;
 		}
 
+		// Prevent creating a category with the reserved name
+		if (newCategory.name.trim() === DEFAULT_CATEGORY_NAME) {
+			setValidationErrors([`"${DEFAULT_CATEGORY_NAME}" is a reserved category name`]);
+			return;
+		}
+
 		const category: SABnzbdCategory = {
 			name: newCategory.name.trim(),
 			order: newCategory.order,
@@ -231,12 +255,11 @@ export function SABnzbdConfigSection({
 							className="input"
 							value={formData.complete_dir}
 							readOnly={isReadOnly}
-							placeholder="/mnt/altmount/complete"
+							placeholder="/"
 							onChange={(e) => handleCompleteDirChange(e.target.value)}
 						/>
 						<p className="label">
-							Absolute path to the directory where the full imports will be stored, relative to the
-							mounted folder.
+							Base virtual directory (relative to mount point, defaults to root).
 						</p>
 					</fieldset>
 
@@ -346,9 +369,16 @@ export function SABnzbdConfigSection({
 							<div className="space-y-3">
 								{formData.categories
 									.sort((a, b) => a.order - b.order)
-									.map((category, index) => (
-										<div key={index} className="card bg-base-200 shadow-sm">
+									.map((category, index) => {
+										const isDefault = isDefaultCategory(category.name);
+										return (
+										<div key={index} className={`card shadow-sm ${isDefault ? 'bg-base-300 border border-primary/30' : 'bg-base-200'}`}>
 											<div className="card-body p-4">
+												{isDefault && (
+													<div className="badge badge-primary badge-sm mb-2">
+														System Default (name cannot be changed)
+													</div>
+												)}
 												<div className="grid grid-cols-1 gap-4 md:grid-cols-4">
 													<fieldset className="fieldset">
 														<legend className="fieldset-legend">Name</legend>
@@ -356,11 +386,15 @@ export function SABnzbdConfigSection({
 															type="text"
 															className="input input-sm"
 															value={category.name}
-															readOnly={isReadOnly}
+															readOnly={isReadOnly || isDefault}
+															disabled={isDefault}
 															onChange={(e) =>
 																handleCategoryUpdate(index, { name: e.target.value })
 															}
 														/>
+														{isDefault && (
+															<p className="label text-xs text-base-content/60">Name is immutable</p>
+														)}
 													</fieldset>
 													<fieldset className="fieldset">
 														<legend className="fieldset-legend">Order</legend>
@@ -400,12 +434,15 @@ export function SABnzbdConfigSection({
 															className="input input-sm"
 															value={category.dir}
 															readOnly={isReadOnly}
-															placeholder="Optional subdirectory"
+															placeholder={isDefault ? "complete" : "Optional subdirectory"}
 															onChange={(e) => handleCategoryUpdate(index, { dir: e.target.value })}
 														/>
+														{isDefault && (
+															<p className="label text-xs text-base-content/60">Default: complete</p>
+														)}
 													</fieldset>
 												</div>
-												{!isReadOnly && (
+												{!isReadOnly && !isDefault && (
 													<div className="mt-2 flex justify-end">
 														<button
 															type="button"
diff --git a/internal/api/auth_handlers.go b/internal/api/auth_handlers.go
index fbb33349f..6473c0e5b 100644
--- a/internal/api/auth_handlers.go
+++ b/internal/api/auth_handlers.go
@@ -318,6 +318,27 @@ func (s *Server) handleRegenerateAPIKey(c *fiber.Ctx) error {
 		return RespondInternalError(c, "Failed to regenerate API key", err.Error())
 	}
 
+	// If key_override is configured (has a value with 33 chars), update it with the new key
+	if s.configManager != nil {
+		cfg := s.configManager.GetConfig()
+		if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 33 {
+			// Update the key_override in config to match the new key
+			newConfig := cfg.DeepCopy()
+			newConfig.API.KeyOverride = apiKey
+
+			if err := s.configManager.UpdateConfig(newConfig); err != nil {
+				slog.WarnContext(c.Context(), "Failed to update key_override in config", "error", err)
+				// Don't fail the request, just log the warning
+			} else {
+				if err := s.configManager.SaveConfig(); err != nil {
+					slog.WarnContext(c.Context(), "Failed to save config after updating key_override", "error", err)
+				} else {
+					slog.InfoContext(c.Context(), "Updated key_override in config with new API key")
+				}
+			}
+		}
+	}
+
 	response := fiber.Map{
 		"api_key": apiKey,
 		"message": "API key regenerated successfully",
diff --git a/internal/api/parsers.go b/internal/api/parsers.go
index c87259b4f..986cc572b 100644
--- a/internal/api/parsers.go
+++ b/internal/api/parsers.go
@@ -105,6 +105,16 @@ func ParseTimeParamFiber(c *fiber.Ctx, param string) (*time.Time, error) {
 
 // validateAPIKey validates the API key using AltMount's authentication system
 func (s *Server) validateAPIKey(c *fiber.Ctx, apiKey string) bool {
+	cfg := s.configManager.GetConfig()
+
+	// Check config key_override first (must be exactly 33 chars)
+	if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 33 {
+		if apiKey == cfg.API.KeyOverride {
+			return true
+		}
+	}
+
+	// Fall back to database validation
 	if s.userRepo == nil {
 		return false
 	}
diff --git a/internal/api/sabnzbd_handlers.go b/internal/api/sabnzbd_handlers.go
index f107987c1..3bbc652ce 100644
--- a/internal/api/sabnzbd_handlers.go
+++ b/internal/api/sabnzbd_handlers.go
@@ -29,6 +29,25 @@ var defaultCategory = config.SABnzbdCategory{
 	Dir:      "",
 }
 
+// getDefaultCategory returns the Default category from config or a fallback
+func (s *Server) getDefaultCategory() config.SABnzbdCategory {
+	if s.configManager != nil {
+		cfg := s.configManager.GetConfig()
+		for _, cat := range cfg.SABnzbd.Categories {
+			if cat.Name == config.DefaultCategoryName {
+				return cat
+			}
+		}
+	}
+	// Fallback if not found in config
+	return config.SABnzbdCategory{
+		Name:     config.DefaultCategoryName,
+		Order:    0,
+		Priority: 0,
+		Dir:      config.DefaultCategoryDir,
+	}
+}
+
 // handleSABnzbd is the main handler for SABnzbd API endpoints
 func (s *Server) handleSABnzbd(c *fiber.Ctx) error {
 	// Check if SABnzbd API is enabled
@@ -890,30 +909,40 @@ func (s *Server) parseSABnzbdPriority(priority string) database.QueuePriority {
 
 // buildCategoryPath builds the directory path for a category
 func (s *Server) buildCategoryPath(category string) string {
-	// Return empty for default category (no subdirectory)
-	if category == "default" || category == "" {
-		return ""
+	// Empty category uses Default category's Dir
+	if category == "" {
+		category = config.DefaultCategoryName
 	}
 
 	if s.configManager == nil {
-		// No config manager, use category name as directory
+		// No config manager, use category name as directory (Default uses its default dir)
+		if category == config.DefaultCategoryName {
+			return config.DefaultCategoryDir
+		}
 		return category
 	}
 
-	config := s.configManager.GetConfig()
+	cfg := s.configManager.GetConfig()
 
 	// If no categories are configured, use category name as directory
-	if len(config.SABnzbd.Categories) == 0 {
+	if len(cfg.SABnzbd.Categories) == 0 {
+		if category == config.DefaultCategoryName {
+			return config.DefaultCategoryDir
+		}
 		return category
 	}
 
 	// Look for the category in configuration
-	for _, configCategory := range config.SABnzbd.Categories {
+	for _, configCategory := range cfg.SABnzbd.Categories {
 		if configCategory.Name == category {
 			// Use configured Dir if available, otherwise use category name
 			if configCategory.Dir != "" {
 				return configCategory.Dir
 			}
+			// For Default category with empty Dir, return default dir
+			if category == config.DefaultCategoryName {
+				return config.DefaultCategoryDir
+			}
 			return category
 		}
 	}
diff --git a/internal/config/manager.go b/internal/config/manager.go
index 4e297a749..3db9116a4 100644
--- a/internal/config/manager.go
+++ b/internal/config/manager.go
@@ -60,7 +60,8 @@ type FuseConfig struct {
 
 // APIConfig represents REST API configuration
 type APIConfig struct {
-	Prefix string `yaml:"prefix" mapstructure:"prefix" json:"prefix"`
+	Prefix      string `yaml:"prefix" mapstructure:"prefix" json:"prefix"`
+	KeyOverride string `yaml:"key_override" mapstructure:"key_override" json:"key_override,omitempty"`
 }
 
 // AuthConfig represents authentication configuration
@@ -245,6 +246,42 @@ type SABnzbdCategory struct {
 	Type     string `yaml:"type" mapstructure:"type" json:"type"` // "sonarr" or "radarr"
 }
 
+// DefaultCategoryName is the name of the mandatory default category
+const DefaultCategoryName = "Default"
+
+// DefaultCategoryDir is the default directory for the Default category
+const DefaultCategoryDir = "complete"
+
+// EnsureDefaultCategory ensures that the Default category always exists in the configuration.
+// The Default category's name cannot be changed, but order, priority, and dir can be customized via YAML.
+// If not configured, uses sensible defaults (order=0, priority=0, dir="complete").
+func (c *Config) EnsureDefaultCategory() {
+	// Check if Default category already exists
+	for i, cat := range c.SABnzbd.Categories {
+		if strings.EqualFold(cat.Name, DefaultCategoryName) {
+			// Ensure the name is exactly "Default" (case-sensitive)
+			c.SABnzbd.Categories[i].Name = DefaultCategoryName
+			// Keep customized values from YAML, only set defaults if not configured
+			// Dir defaults to "complete" if empty
+			if c.SABnzbd.Categories[i].Dir == "" {
+				c.SABnzbd.Categories[i].Dir = DefaultCategoryDir
+			}
+			return
+		}
+	}
+
+	// Default category doesn't exist, add it at the beginning with default values
+	defaultCat := SABnzbdCategory{
+		Name:     DefaultCategoryName,
+		Order:    0,
+		Priority: 0,                // Normal priority
+		Dir:      DefaultCategoryDir, // Default dir for files
+	}
+
+	// Prepend Default category to the list
+	c.SABnzbd.Categories = append([]SABnzbdCategory{defaultCat}, c.SABnzbd.Categories...)
+}
+
 // ArrsConfig represents arrs configuration
 type ArrsConfig struct {
 	Enabled                     *bool                `yaml:"enabled" mapstructure:"enabled" json:"enabled"`
@@ -478,13 +515,24 @@ func (c *Config) Validate() error {
 
 	// Validate SABnzbd configuration
 	if c.SABnzbd.Enabled != nil && *c.SABnzbd.Enabled {
+		// CompleteDir is a virtual path relative to the mount point, not an absolute filesystem path
+		// It defaults to "/" (root of mount) if not specified
+		// Normalize: remove leading/trailing slashes for consistency, then ensure it starts with /
 		if c.SABnzbd.CompleteDir == "" {
-			return fmt.Errorf("sabnzbd complete_dir cannot be empty when SABnzbd is enabled")
-		}
-		if !filepath.IsAbs(c.SABnzbd.CompleteDir) {
-			return fmt.Errorf("sabnzbd complete_dir must be an absolute path")
+			c.SABnzbd.CompleteDir = "/"
+		} else {
+			// Normalize the path: ensure it starts with / and remove trailing /
+			cleanDir := strings.Trim(c.SABnzbd.CompleteDir, "/")
+			if cleanDir == "" {
+				c.SABnzbd.CompleteDir = "/"
+			} else {
+				c.SABnzbd.CompleteDir = "/" + cleanDir
+			}
 		}
 
+		// Ensure Default category always exists
+		c.EnsureDefaultCategory()
+
 		// Validate categories if provided
 		categoryNames := make(map[string]bool)
 		for i, category := range c.SABnzbd.Categories {
diff --git a/internal/importer/service.go b/internal/importer/service.go
index b10bf1c49..c8c9b710c 100644
--- a/internal/importer/service.go
+++ b/internal/importer/service.go
@@ -752,21 +752,32 @@ func (s *Service) ensurePersistentNzb(ctx context.Context, item *database.Import
 
 // buildCategoryPath resolves a category name to its configured directory path.
 // Returns the category's Dir if configured, otherwise falls back to the category name.
+// buildCategoryPath builds the directory path for a category.
+// For Default category, returns its configured Dir (defaults to "complete").
 func (s *Service) buildCategoryPath(category string) string {
-	if category == "" || category == "default" {
-		return ""
+	// Empty category uses Default category
+	if category == "" {
+		category = config.DefaultCategoryName
 	}
 
 	cfg := s.configGetter()
 	if cfg == nil || len(cfg.SABnzbd.Categories) == 0 {
+		// No config, use default dir for Default category
+		if strings.EqualFold(category, config.DefaultCategoryName) {
+			return config.DefaultCategoryDir
+		}
 		return category
 	}
 
 	for _, cat := range cfg.SABnzbd.Categories {
-		if cat.Name == category {
+		if strings.EqualFold(cat.Name, category) {
 			if cat.Dir != "" {
 				return cat.Dir
 			}
+			// For Default category with empty Dir, return default dir
+			if strings.EqualFold(category, config.DefaultCategoryName) {
+				return config.DefaultCategoryDir
+			}
 			return category
 		}
 	}

From 85ec33e6f39cb3d91c308df6de91078f049c08f2 Mon Sep 17 00:00:00 2001
From: Castle <7586648+MythodeaLoL@users.noreply.github.com>
Date: Mon, 5 Jan 2026 05:35:31 -0300
Subject: [PATCH 2/4] fix typo

---
 config.sample.yaml            | 2 +-
 internal/api/auth_handlers.go | 4 ++--
 internal/api/parsers.go       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.sample.yaml b/config.sample.yaml
index 09260cf49..6a0a47828 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -10,7 +10,7 @@ webdav:
 # REST API configuration
 api:
   prefix: '/api' # API endpoint prefix
-  key_override: '' # 33-char API key override (takes precedence over database key, leave empty to use database)
+  key_override: '' # 32-char API key override (takes precedence over database key, leave empty to use database)
 
 # Authentication configuration
 auth:
diff --git a/internal/api/auth_handlers.go b/internal/api/auth_handlers.go
index 6473c0e5b..11c874778 100644
--- a/internal/api/auth_handlers.go
+++ b/internal/api/auth_handlers.go
@@ -318,10 +318,10 @@ func (s *Server) handleRegenerateAPIKey(c *fiber.Ctx) error {
 		return RespondInternalError(c, "Failed to regenerate API key", err.Error())
 	}
 
-	// If key_override is configured (has a value with 33 chars), update it with the new key
+	// If key_override is configured (has a value with 32 chars), update it with the new key
 	if s.configManager != nil {
 		cfg := s.configManager.GetConfig()
-		if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 33 {
+		if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 32 {
 			// Update the key_override in config to match the new key
 			newConfig := cfg.DeepCopy()
 			newConfig.API.KeyOverride = apiKey
diff --git a/internal/api/parsers.go b/internal/api/parsers.go
index 986cc572b..29871e3ca 100644
--- a/internal/api/parsers.go
+++ b/internal/api/parsers.go
@@ -108,7 +108,7 @@ func (s *Server) validateAPIKey(c *fiber.Ctx, apiKey string) bool {
 	cfg := s.configManager.GetConfig()
 
 	// Check config key_override first (must be exactly 33 chars)
-	if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 33 {
+	if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 32 {
 		if apiKey == cfg.API.KeyOverride {
 			return true
 		}

From 15a9b0fa8eeea6004f40735a6c43f2d0e9a65418 Mon Sep 17 00:00:00 2001
From: Castle <7586648+MythodeaLoL@users.noreply.github.com>
Date: Mon, 5 Jan 2026 06:16:13 -0300
Subject: [PATCH 3/4] fix merge, typo and missing codes

---
 .../components/config/ArrsConfigSection.tsx   | 16 ++++++++++-----
 .../components/config/ArrsInstanceCard.tsx    | 19 ++++++++++++------
 .../src/components/queue/DragDropUpload.tsx   | 20 ++++++++++++++-----
 internal/api/parsers.go                       | 11 ++++++++--
 internal/api/sabnzbd_handlers.go              |  1 +
 internal/importer/service.go                  |  4 ++--
 6 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/config/ArrsConfigSection.tsx b/frontend/src/components/config/ArrsConfigSection.tsx
index 057c39ac9..236ea2358 100644
--- a/frontend/src/components/config/ArrsConfigSection.tsx
+++ b/frontend/src/components/config/ArrsConfigSection.tsx
@@ -224,6 +224,7 @@ export function ArrsConfigSection({
 				index={index}
 				isReadOnly={isReadOnly}
 				isApiKeyVisible={isApiKeyVisible}
+				categories={config.sabnzbd?.categories}
 				onToggleApiKey={() => toggleApiKeyVisibility(instanceId)}
 				onRemove={() => removeInstance(type, index)}
 				onInstanceChange={(field, value) => handleInstanceChange(type, index, field, value)}
@@ -477,15 +478,20 @@ export function ArrsConfigSection({
 
 							<fieldset className="fieldset">
 								<legend className="fieldset-legend">Download Category (Optional)</legend>
-								<input
-									type="text"
-									className="input"
+								<select
+									className="select"
 									value={newInstance.category}
 									onChange={(e) =>
 										setNewInstance((prev) => ({ ...prev, category: e.target.value }))
 									}
-									placeholder={newInstance.type === "radarr" ? "movies" : "tv"}
-								/>
+								>
+									<option value="">None</option>
+									{config.sabnzbd?.categories?.map((cat) => (
+										<option key={cat.name} value={cat.name}>
+											{cat.name}
+										</option>
+									))}
+								</select>
 							</fieldset>
 
 							<label className="label cursor-pointer">
diff --git a/frontend/src/components/config/ArrsInstanceCard.tsx b/frontend/src/components/config/ArrsInstanceCard.tsx
index 7a758e557..793f4225f 100644
--- a/frontend/src/components/config/ArrsInstanceCard.tsx
+++ b/frontend/src/components/config/ArrsInstanceCard.tsx
@@ -1,6 +1,6 @@
 import { Eye, EyeOff, Trash2 } from "lucide-react";
 import { useCallback, useState } from "react";
-import type { ArrsInstanceConfig, ArrsType } from "../../types/config";
+import type { ArrsInstanceConfig, ArrsType, SABnzbdCategory } from "../../types/config";
 
 interface ArrsInstanceCardProps {
 	instance: ArrsInstanceConfig;
@@ -8,6 +8,7 @@ interface ArrsInstanceCardProps {
 	index: number;
 	isReadOnly: boolean;
 	isApiKeyVisible: boolean;
+	categories?: SABnzbdCategory[];
 	onToggleApiKey: () => void;
 	onRemove: () => void;
 	onInstanceChange: (
@@ -22,6 +23,7 @@ export function ArrsInstanceCard({
 	index,
 	isReadOnly,
 	isApiKeyVisible,
+	categories = [],
 	onToggleApiKey,
 	onRemove,
 	onInstanceChange,
@@ -143,14 +145,19 @@ export function ArrsInstanceCard({
 
 					<fieldset className="fieldset">
 						<legend className="fieldset-legend">Download Category (Optional)</legend>
-						<input
-							type="text"
-							className="input"
+						<select
+							className="select"
 							value={instance.category || ""}
 							onChange={(e) => handleInstanceChange("category", e.target.value)}
-							placeholder={type === "radarr" ? "movies" : "tv"}
 							disabled={isReadOnly}
-						/>
+						>
+							<option value="">None</option>
+							{categories.map((cat) => (
+								<option key={cat.name} value={cat.name}>
+									{cat.name}
+								</option>
+							))}
+						</select>
 						<p className="label text-base-content/70 text-xs">
 							SABnzbd category to use for this instance. Defaults to "
 							{type === "radarr" ? "movies" : "tv"}".
diff --git a/frontend/src/components/queue/DragDropUpload.tsx b/frontend/src/components/queue/DragDropUpload.tsx
index 3f3120814..e53fb2d1d 100644
--- a/frontend/src/components/queue/DragDropUpload.tsx
+++ b/frontend/src/components/queue/DragDropUpload.tsx
@@ -2,6 +2,7 @@ import { AlertCircle, CheckCircle2, Download, FileIcon, Link, Upload, X } from "
 import { useCallback, useState } from "react";
 import { useToast } from "../../contexts/ToastContext";
 import { useUploadNZBLnks, useUploadToQueue } from "../../hooks/useApi";
+import { useConfig } from "../../hooks/useConfig";
 import { ErrorAlert } from "../ui/ErrorAlert";
 
 interface UploadedFile {
@@ -32,6 +33,10 @@ export function DragDropUpload() {
 	const uploadMutation = useUploadToQueue();
 	const uploadLinksMutation = useUploadNZBLnks();
 	const { showToast } = useToast();
+	const { data: config } = useConfig();
+
+	// Get available categories from config
+	const categories = config?.sabnzbd?.categories ?? [];
 
 	const validateFile = useCallback((file: File): string | null => {
 		// Check file extension
@@ -407,13 +412,18 @@ export function DragDropUpload() {
 				{/* Category Input (shared) */}
 				<fieldset className="fieldset mb-4">
 					<legend className="fieldset-legend">Category (optional)</legend>
-					<input
-						type="text"
-						className="input"
-						placeholder="e.g., movies, tv, software"
+					<select
+						className="select"
 						value={category}
 						onChange={(e) => setCategory(e.target.value)}
-					/>
+					>
+						<option value="">None</option>
+						{categories.map((cat) => (
+							<option key={cat.name} value={cat.name}>
+								{cat.name}
+							</option>
+						))}
+					</select>
 					<p className="label">Category will be applied to all uploaded items</p>
 				</fieldset>
 
diff --git a/internal/api/parsers.go b/internal/api/parsers.go
index 29871e3ca..0032b1f90 100644
--- a/internal/api/parsers.go
+++ b/internal/api/parsers.go
@@ -104,13 +104,20 @@ func ParseTimeParamFiber(c *fiber.Ctx, param string) (*time.Time, error) {
 }
 
 // validateAPIKey validates the API key using AltMount's authentication system
+// First checks if there's a key_override in config (must be exactly 32 characters)
+// Then falls back to checking the database
 func (s *Server) validateAPIKey(c *fiber.Ctx, apiKey string) bool {
-	cfg := s.configManager.GetConfig()
+	if apiKey == "" {
+		return false
+	}
 
-	// Check config key_override first (must be exactly 33 chars)
+	// Check config key_override first (must be exactly 32 characters to be valid)
+	if s.configManager != nil {
+	cfg := s.configManager.GetConfig()
 	if cfg.API.KeyOverride != "" && len(cfg.API.KeyOverride) == 32 {
 		if apiKey == cfg.API.KeyOverride {
 			return true
+			}
 		}
 	}
 
diff --git a/internal/api/sabnzbd_handlers.go b/internal/api/sabnzbd_handlers.go
index 3bbc652ce..b4274d67c 100644
--- a/internal/api/sabnzbd_handlers.go
+++ b/internal/api/sabnzbd_handlers.go
@@ -953,6 +953,7 @@ func (s *Server) buildCategoryPath(category string) string {
 
 // validateSABnzbdCategory validates and returns the category, or error if invalid
 func (s *Server) validateSABnzbdCategory(category string) (string, error) {
+	defaultCategory := s.getDefaultCategory()
 	if category == "" {
 		return defaultCategory.Name, nil
 	}
diff --git a/internal/importer/service.go b/internal/importer/service.go
index c8c9b710c..ed3743614 100644
--- a/internal/importer/service.go
+++ b/internal/importer/service.go
@@ -1071,12 +1071,12 @@ func (s *Service) calculateStrmFileSize(r io.Reader) (int64, error) {
 
 			fileSizeStr := u.Query().Get("file_size")
 			if fileSizeStr == "" {
-				return 0, NewNonRetryableError("missing file_size parameter in NZG link", nil)
+				return 0, NewNonRetryableError("missing file_size parameter in NXG link", nil)
 			}
 
 			fileSize, err := strconv.ParseInt(fileSizeStr, 10, 64)
 			if err != nil {
-				return 0, NewNonRetryableError("invalid file_size parameter in NZG link", err)
+				return 0, NewNonRetryableError("invalid file_size parameter in NXG link", err)
 			}
 
 			return fileSize, nil

From 4274d9b4f71efb65712cdf7f22c7d93f288f0649 Mon Sep 17 00:00:00 2001
From: Castle <7586648+MythodeaLoL@users.noreply.github.com>
Date: Mon, 5 Jan 2026 06:37:41 -0300
Subject: [PATCH 4/4] fix merge, missing codes.

---
 frontend/src/components/config/SABnzbdConfigSection.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/config/SABnzbdConfigSection.tsx b/frontend/src/components/config/SABnzbdConfigSection.tsx
index 8c02d8043..1df8a58af 100644
--- a/frontend/src/components/config/SABnzbdConfigSection.tsx
+++ b/frontend/src/components/config/SABnzbdConfigSection.tsx
@@ -456,7 +456,7 @@ export function SABnzbdConfigSection({
 												)}
 											</div>
 										</div>
-									))}
+									)})}
 							</div>
 						)}