diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py
index 68b24ee396..53ecaa1d63 100644
--- a/src/backend/InvenTree/InvenTree/settings.py
+++ b/src/backend/InvenTree/InvenTree/settings.py
@@ -86,6 +86,7 @@ ENABLE_CLASSIC_FRONTEND = get_boolean_setting(
 # Disable CUI parts if CUI tests are disabled
 if TESTING and '--exclude-tag=cui' in sys.argv:
     ENABLE_CLASSIC_FRONTEND = False
+
 ENABLE_PLATFORM_FRONTEND = get_boolean_setting(
     'INVENTREE_PLATFORM_FRONTEND', 'platform_frontend', True
 )
diff --git a/src/backend/InvenTree/InvenTree/templatetags/inventree_extras.py b/src/backend/InvenTree/InvenTree/templatetags/inventree_extras.py
index ad476ba671..d202bb5416 100644
--- a/src/backend/InvenTree/InvenTree/templatetags/inventree_extras.py
+++ b/src/backend/InvenTree/InvenTree/templatetags/inventree_extras.py
@@ -670,3 +670,15 @@ def admin_url(user, table, pk):
             pass
 
     return url
+
+
+@register.simple_tag()
+def cui_enabled():
+    """Return True if the CUI is enabled."""
+    return settings.ENABLE_CLASSIC_FRONTEND
+
+
+@register.simple_tag()
+def pui_enabled():
+    """Return True if the PUI is enabled."""
+    return settings.ENABLE_PLATFORM_FRONTEND
diff --git a/src/backend/InvenTree/InvenTree/urls.py b/src/backend/InvenTree/InvenTree/urls.py
index 91a6ce35ca..21e002ea56 100644
--- a/src/backend/InvenTree/InvenTree/urls.py
+++ b/src/backend/InvenTree/InvenTree/urls.py
@@ -504,14 +504,14 @@ urlpatterns.append(
     )
 )
 
-# Send any unknown URLs to the parts page
+# Send any unknown URLs to the index page
 urlpatterns += [
     re_path(
         r'^.*$',
         RedirectView.as_view(
             url='/index/'
             if settings.ENABLE_CLASSIC_FRONTEND
-            else settings.FRONTEND_URL_BASE,
+            else f'/{settings.FRONTEND_URL_BASE}/',
             permanent=False,
         ),
         name='index',
diff --git a/src/backend/InvenTree/templates/pui_banner.html b/src/backend/InvenTree/templates/pui_banner.html
index d6eb0746f3..6488ff4c2e 100644
--- a/src/backend/InvenTree/templates/pui_banner.html
+++ b/src/backend/InvenTree/templates/pui_banner.html
@@ -2,8 +2,9 @@
 {% load i18n %}
 
 {% inventree_customize 'hide_pui_banner' as hidden %}
+{% pui_enabled as pui %}
 
-{% if not hidden %}
+{% if pui and not hidden %}
 <div class='alert alert-block alert-warning'>
     {% if mode == 'admin' %}
     {% trans "Platform UI - the new UI for InvenTree - provides more modern administration options." %}