diff --git a/pythonie/pythonie/settings/base.py b/pythonie/pythonie/settings/base.py
index 3d7ff5d..94454f8 100644
--- a/pythonie/pythonie/settings/base.py
+++ b/pythonie/pythonie/settings/base.py
@@ -35,6 +35,10 @@
 # e.g. in notification emails. Don't include '/admin' or a trailing slash
 BASE_URL = "https://python.ie"
 
+# Wagtail admin base URL for admin URLs outside the admin interface
+# (e.g. notification emails and the user bar)
+WAGTAILADMIN_BASE_URL = BASE_URL
+
 # Application definition
 
 INSTALLED_APPS = (
diff --git a/pythonie/pythonie/settings/dev.py b/pythonie/pythonie/settings/dev.py
index acc5db5..d347b08 100644
--- a/pythonie/pythonie/settings/dev.py
+++ b/pythonie/pythonie/settings/dev.py
@@ -10,6 +10,9 @@
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
+# Override Wagtail admin base URL for local development
+WAGTAILADMIN_BASE_URL = "http://localhost:8000"
+
 # SQLite (simplest install)
 DATABASES = {
     "default": {
diff --git a/pythonie/pythonie/settings/tests.py b/pythonie/pythonie/settings/tests.py
index 6bb5e72..c129f2c 100644
--- a/pythonie/pythonie/settings/tests.py
+++ b/pythonie/pythonie/settings/tests.py
@@ -10,6 +10,9 @@
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
+# Override Wagtail admin base URL for tests
+WAGTAILADMIN_BASE_URL = "http://testserver"
+
 # Use PostgreSQL if DATABASE_URL is set (for CI), otherwise use SQLite (for local tests)
 if os.getenv("DATABASE_URL"):
     DATABASES = {"default": dj_database_url.config(conn_max_age=500)}