diff --git a/app/templates/components/header.html b/app/templates/components/header.html
index a07f01506..2d8f5d2d6 100644
--- a/app/templates/components/header.html
+++ b/app/templates/components/header.html
@@ -5,7 +5,7 @@
 
 {% if current_user.is_authenticated %}
 {% set navigation = [
-  {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard')},
+  {"href": url_for("main.show_accounts_or_dashboard"), "text": "Current service", "active": request.path.startswith('/accounts')},
   {"href": url_for('main.get_started'), "text": "Using Notify", "active": request.path.startswith('/using-notify')},
   {"href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support')}
 ] %}
diff --git a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png
index 9ff74f422..192e73640 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png
index 474f3b122..e6ae391a8 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Best_Practices_0_document_0_desktop.png differ