diff --git a/manage_breast_screening/config/settings.py b/manage_breast_screening/config/settings.py
index 69996cb53..464e8c775 100644
--- a/manage_breast_screening/config/settings.py
+++ b/manage_breast_screening/config/settings.py
@@ -125,6 +125,9 @@ def list_env(key):
         "APP_DIRS": True,
         "OPTIONS": {
             "environment": "manage_breast_screening.config.jinja2_env.environment",
+            "context_processors": [
+                "manage_breast_screening.core.context_processors.nav_active",
+            ],
             "undefined": ChainableUndefined,
         },
     },
diff --git a/manage_breast_screening/core/context_processors.py b/manage_breast_screening/core/context_processors.py
new file mode 100644
index 000000000..92a5443ef
--- /dev/null
+++ b/manage_breast_screening/core/context_processors.py
@@ -0,0 +1,6 @@
+def nav_active(request):
+    if request.path.startswith("/clinics/"):
+        active = "clinics"
+    else:
+        active = "home"
+    return {"navActive": active}
diff --git a/manage_breast_screening/core/jinja2/layout-app.jinja b/manage_breast_screening/core/jinja2/layout-app.jinja
index 7c4ab8e7c..942551e78 100644
--- a/manage_breast_screening/core/jinja2/layout-app.jinja
+++ b/manage_breast_screening/core/jinja2/layout-app.jinja
@@ -15,7 +15,7 @@
 {% block header %}
   {{ header({
     "service": {
-      "name": "Manage breast screening"
+      "text": "Manage breast screening"
     },
     "account": {
       "items": header_account_items(request.user)
@@ -29,7 +29,7 @@
         },
         {
           "href": "/clinics/",
-          "text": "Clinics",
+          "text": "Screening",
           'current': true if navActive == "clinics"
         }
       ]
diff --git a/manage_breast_screening/core/template_helpers.py b/manage_breast_screening/core/template_helpers.py
index f47ea42d4..90cf32bb9 100644
--- a/manage_breast_screening/core/template_helpers.py
+++ b/manage_breast_screening/core/template_helpers.py
@@ -130,6 +130,9 @@ def _user_name_and_role_item(user):
 
 def header_account_items(user):
     items = []
+    if user.is_authenticated:
+        if user.current_provider:
+            items.append({"text": user.current_provider.name, "icon": False})
 
     user_name_and_role = _user_name_and_role_item(user)
     if user_name_and_role: