diff --git a/app/templates/views/service-settings/set-email-branding.html b/app/templates/views/service-settings/set-email-branding.html
index 4de59364d..e8baba461 100644
--- a/app/templates/views/service-settings/set-email-branding.html
+++ b/app/templates/views/service-settings/set-email-branding.html
@@ -5,14 +5,16 @@
{% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %}
+{% set page_title = "Set email branding" %}
+
{% block service_page_title %}
- Set email branding
+ {{ page_title }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
- 'Set email branding',
+ page_title,
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
{% call form_wrapper(data_kwargs={'preview-type': 'email'}) %}
@@ -22,7 +24,13 @@
- {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search branding styles by name') }}
+ {{ live_search(
+ target_selector='.multiple-choice',
+ show=True,
+ form=search_form,
+ label='Search branding styles by name',
+ autofocus=True
+ ) }}
{{ radios(form.branding_style) }}
diff --git a/app/templates/views/service-settings/set-letter-branding.html b/app/templates/views/service-settings/set-letter-branding.html
index 455dcad65..4cb919a81 100644
--- a/app/templates/views/service-settings/set-letter-branding.html
+++ b/app/templates/views/service-settings/set-letter-branding.html
@@ -5,14 +5,16 @@
{% from "components/page-footer.html" import page_footer %}
{% from "components/form.html" import form_wrapper %}
+{% set page_title = "Set letter branding" %}
+
{% block service_page_title %}
- Set letter branding
+ {{ page_title }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
- 'Set letter branding',
+ page_title,
back_link=url_for('.service_settings', service_id=current_service.id)
) }}
{% call form_wrapper(data_kwargs={'preview-type': 'letter'}) %}
@@ -22,7 +24,13 @@
- {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }}
+ {{ live_search(
+ target_selector='.multiple-choice',
+ show=True,
+ form=search_form,
+ label='Search by name',
+ autofocus=True
+ ) }}
{{ radios(form.branding_style, hide_legend=True) }}