diff --git a/app/templates/components/table.html b/app/templates/components/table.html
index 2697cc6f6..8708465b2 100644
--- a/app/templates/components/table.html
+++ b/app/templates/components/table.html
@@ -105,10 +105,8 @@
   {% endcall %}
 {%- endmacro %}
 
-{% macro boolean_field(yes) -%}
-  {% call field(status='yes' if yes else 'no') %}
-    {{ "Yes" if yes else "No" }}
-  {% endcall %}
+{% macro boolean_field(value) -%}
+  {{ text_field('On' if value else 'Off') }}
 {%- endmacro %}
 
 {% macro right_aligned_field_heading(text) %}
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 498e70ffc..555be8279 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -1,5 +1,5 @@
 {% extends "withnav_template.html" %}
-{% from "components/table.html" import list_table, row, field, boolean_field, hidden_field_heading %}
+{% from "components/table.html" import list_table, row, field, hidden_field_heading %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/tick-cross.html" import tick_cross %}
 
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index d587a7fc3..60fcf1f3e 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/browse-list.html" import browse_list %}
-{% from "components/table.html" import mapping_table, row, text_field, edit_field, field %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, field, boolean_field %}
 
 {% block service_page_title %}
   Settings
@@ -47,19 +47,19 @@
 
         {% call row() %}
           {{ text_field('International text messages') }}
-          {{ text_field('On' if current_service.can_send_international_sms else 'Off') }}
+          {{ boolean_field(current_service.can_send_international_sms) }}
           {{ edit_field('Change', url_for('.service_set_international_sms', service_id=current_service.id)) }}
         {% endcall %}
 
         {% call row() %}
           {{ text_field('Receive text messages') }}
-          {{ text_field('On' if 'inbound_sms' in current_service.permissions else 'Off') }}
+          {{ boolean_field('inbound_sms' in current_service.permissions) }}
           {{ edit_field('Change', url_for('.service_set_inbound_sms', service_id=current_service.id)) }}
         {% endcall %}
 
         {% call row() %}
           {{ text_field('Letters') }}
-          {{ text_field('On' if current_service.can_send_letters else 'Off') }}
+          {{ boolean_field(current_service.can_send_letters) }}
           {{ edit_field('Change', url_for('.service_set_letters', service_id=current_service.id)) }}
         {% endcall %}