diff --git a/app/main/views/email_branding.py b/app/main/views/email_branding.py index 60a9745d7..1f4942beb 100644 --- a/app/main/views/email_branding.py +++ b/app/main/views/email_branding.py @@ -29,7 +29,8 @@ def email_branding(): brandings = email_branding_client.get_all_email_branding() form = ServiceSelectEmailBranding() - form.email_branding.choices = get_branding_as_value_and_label(brandings) + [('None', 'Create a new email branding')] + email_brandings = sorted(get_branding_as_value_and_label(brandings), key=lambda tup: tup[1].lower()) + form.email_branding.choices = email_brandings + [('None', 'Create a new email branding')] if form.validate_on_submit(): if form.email_branding.data != 'None': diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index a180fdcba..5eb1b21f6 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -872,7 +872,9 @@ def service_set_email_branding(service_id): form = ServiceSetBranding(branding_type=branding_type) # dynamically create org choices, including the null option - form.branding_style.choices = [('None', 'None')] + get_branding_as_value_and_label(email_branding) + email_brandings = sorted(get_branding_as_value_and_label(email_branding), + key=lambda tup: tup[1].lower()) + form.branding_style.choices = [('None', 'None')] + email_brandings if form.validate_on_submit(): branding_style = None if form.branding_style.data == 'None' else form.branding_style.data