diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 15f2a3be6..4576fd019 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -331,7 +331,7 @@
 
           {% call row() %}
             {{ text_field('Count in list of live services')}}
-            {{ text_field('Yes' if current_service.count_as_live else 'No') }}
+            {{ text_field(current_service.count_as_live|format_yes_no) }}
             {{ edit_field('Change', url_for('.service_switch_count_as_live', service_id=current_service.id), suffix='if service is counted in list of live services') }}
           {% endcall %}
           {% call row() %}
diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html
index 9fc1c835d..0687b4e51 100644
--- a/app/templates/views/user-profile.html
+++ b/app/templates/views/user-profile.html
@@ -84,7 +84,7 @@
       {% if current_user.platform_admin or session.get('disable_platform_admin_view') %}
         {% call row(id='disable-platform-admin') %}
           {{ text_field('Use platform admin view') }}
-          {{ text_field('Yes' if not session.get('disable_platform_admin_view') else 'No') }}
+          {{ text_field((not session.get('disable_platform_admin_view'))|format_yes_no) }}
           {{ edit_field(
               'Change',
               url_for('.user_profile_disable_platform_admin_view'),