diff --git a/core/api_keys.py b/core/api_keys.py
index 24c04f9..62abd6a 100644
--- a/core/api_keys.py
+++ b/core/api_keys.py
@@ -10,12 +10,12 @@ import json
 import logging
 import os
 import secrets
-
-import bcrypt
 from dataclasses import asdict, dataclass
 from datetime import datetime, timedelta
 from pathlib import Path
 
+import bcrypt
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/core/dashboard/routes.py b/core/dashboard/routes.py
index bb0dbc0..817df94 100644
--- a/core/dashboard/routes.py
+++ b/core/dashboard/routes.py
@@ -850,9 +850,7 @@ async def get_all_projects(
         is_admin = False
         current_user_id = None
         if user_session:
-            if hasattr(user_session, "user_type") and user_session.user_type == "master":
-                is_admin = True
-            elif isinstance(user_session, dict) and user_session.get("role") == "admin":
+            if hasattr(user_session, "user_type") and user_session.user_type == "master" or isinstance(user_session, dict) and user_session.get("role") == "admin":
                 is_admin = True
             elif isinstance(user_session, dict) and "user_id" in user_session:
                 current_user_id = user_session["user_id"]
diff --git a/server.py b/server.py
index 7723f09..3f77eda 100644
--- a/server.py
+++ b/server.py
@@ -66,6 +66,8 @@ from core.dashboard.routes import (
     api_get_config,
     api_list_keys,
     api_list_sites,
+    # K.5: Settings routes
+    api_save_setting,
     api_test_site,
     api_update_site,
     # E.2: OAuth Social Login routes
@@ -107,8 +109,6 @@ from core.dashboard.routes import (
     # F.3: Service pages
     dashboard_service_page,
     dashboard_services_list,
-    # K.5: Settings routes
-    api_save_setting,
     dashboard_settings_page,
     # E.3: Site Management pages
     dashboard_sites_add,