diff --git a/assets/css/admin/reset.css b/assets/css/admin/reset.css
index 58288ee..2ddc2fb 100644
--- a/assets/css/admin/reset.css
+++ b/assets/css/admin/reset.css
@@ -6,6 +6,7 @@
 
 body {
   margin: 0;
+  font-family: system-ui, -apple-system, sans-serif;
 }
 
 /* Make LiveView wrapper divs transparent for layout */
diff --git a/docs/plans/admin-font-loading.md b/docs/plans/admin-font-loading.md
index 36ed4f6..3e8456a 100644
--- a/docs/plans/admin-font-loading.md
+++ b/docs/plans/admin-font-loading.md
@@ -1,6 +1,6 @@
 # Admin font loading
 
-Status: Open — needs discussion
+Status: Complete (Option A + cache miss fix)
 
 ## Problem
 
diff --git a/lib/berrypod_web/controllers/error_html.ex b/lib/berrypod_web/controllers/error_html.ex
index 7c482ee..9b6e9c3 100644
--- a/lib/berrypod_web/controllers/error_html.ex
+++ b/lib/berrypod_web/controllers/error_html.ex
@@ -114,7 +114,7 @@ defmodule BerrypodWeb.ErrorHTML do
             css
 
           :miss ->
-            css = CSSGenerator.generate(theme_settings)
+            css = CSSGenerator.generate(theme_settings, &BerrypodWeb.Endpoint.static_path/1)
             CSSCache.put(css)
             css
         end
diff --git a/lib/berrypod_web/live/admin/providers/form.ex b/lib/berrypod_web/live/admin/providers/form.ex
index 0280287..19f5535 100644
--- a/lib/berrypod_web/live/admin/providers/form.ex
+++ b/lib/berrypod_web/live/admin/providers/form.ex
@@ -138,7 +138,7 @@ defmodule BerrypodWeb.Admin.Providers.Form do
 
   defp maybe_add_name(params, type, _result) do
     provider = Provider.get(type)
-    Map.put_new(params, "name", provider && provider.name || type)
+    Map.put_new(params, "name", (provider && provider.name) || type)
   end
 
   defp encrypt_api_key(api_key) do
diff --git a/lib/berrypod_web/plugs/load_theme.ex b/lib/berrypod_web/plugs/load_theme.ex
index 92d45ce..81e816d 100644
--- a/lib/berrypod_web/plugs/load_theme.ex
+++ b/lib/berrypod_web/plugs/load_theme.ex
@@ -27,7 +27,7 @@ defmodule BerrypodWeb.Plugs.LoadTheme do
 
         :miss ->
           settings = Settings.get_theme_settings()
-          css = CSSGenerator.generate(settings)
+          css = CSSGenerator.generate(settings, &BerrypodWeb.Endpoint.static_path/1)
           CSSCache.put(css)
           {settings, css}
       end
diff --git a/lib/berrypod_web/theme_hook.ex b/lib/berrypod_web/theme_hook.ex
index a36fbbb..61ef3d4 100644
--- a/lib/berrypod_web/theme_hook.ex
+++ b/lib/berrypod_web/theme_hook.ex
@@ -26,7 +26,7 @@ defmodule BerrypodWeb.ThemeHook do
           css
 
         :miss ->
-          css = CSSGenerator.generate(theme_settings)
+          css = CSSGenerator.generate(theme_settings, &BerrypodWeb.Endpoint.static_path/1)
           CSSCache.put(css)
           css
       end