diff --git a/t/cobrand/bristol.t b/t/cobrand/bristol.t
index d7c2e284d4..905b0e6fdf 100644
--- a/t/cobrand/bristol.t
+++ b/t/cobrand/bristol.t
@@ -70,6 +70,11 @@ my $flytipping = $mech->create_contact_ok(
                 { key => 0, name => 'No' },
                 { key => 1, name => 'Yes' },
             ] },
+            { code => 'Size', values => [
+                { key => 0, name => 'Small' },
+                { key => 1, name => 'Medium' },
+                { key => 2, name => 'Large' },
+            ] },
         ]
     }
 );
@@ -234,7 +239,10 @@ FixMyStreet::override_config {
         my ($p) = $mech->create_problems_for_body(1, $bristol->id, 'Title', {
             cobrand => 'bristol',
             category => $flytipping->category,
-            extra => { _fields => [ { name => 'Witness', value => 1 } ] },
+            extra => { _fields => [
+                { name => 'Witness', value => 1 },
+                { name => 'Size', value => "0" },
+            ] },
         } );
 
         FixMyStreet::Script::Reports::send();
@@ -245,6 +253,7 @@ FixMyStreet::override_config {
         is $p->get_extra_metadata('extra_email_sent'), 1;
         my $email = $mech->get_text_body_from_email;
         like $email, qr/Witness: Yes/;
+        like $email, qr/Size: Small/;
     };
 
     subtest "usrn populated on Alloy category" => sub {
diff --git a/templates/email/buckinghamshire/submit.html b/templates/email/buckinghamshire/submit.html
index 88c5e2f1fb..d08285cdf9 100644
--- a/templates/email/buckinghamshire/submit.html
+++ b/templates/email/buckinghamshire/submit.html
@@ -59,7 +59,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
       [% field.description OR field.name %]: [% field.value_label OR field.value %]
       [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/buckinghamshire/submit.txt b/templates/email/buckinghamshire/submit.txt
index 8592bab873..0da5c68fd9 100644
--- a/templates/email/buckinghamshire/submit.txt
+++ b/templates/email/buckinghamshire/submit.txt
@@ -30,7 +30,7 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/default/cy/submit.html b/templates/email/default/cy/submit.html
index b003c465f5..7a69cbc969 100644
--- a/templates/email/default/cy/submit.html
+++ b/templates/email/default/cy/submit.html
@@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
       [% field.description OR field.name %]: [% field.value_label OR field.value %]
       [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/default/cy/submit.txt b/templates/email/default/cy/submit.txt
index 2ca8cd1853..53cd3643ac 100644
--- a/templates/email/default/cy/submit.txt
+++ b/templates/email/default/cy/submit.txt
@@ -25,7 +25,7 @@ Pwnc: [% report.title %]
 
 Manylion: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html
index 91f1d73274..51ec126775 100644
--- a/templates/email/default/submit.html
+++ b/templates/email/default/submit.html
@@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
       [% field.description OR field.name %]: [% field.value_label OR field.value %]
       [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index a648d668b6..19b66d6dc9 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -25,7 +25,7 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/fixmystreet.com/cy/submit.html b/templates/email/fixmystreet.com/cy/submit.html
index ad2e88b6d7..e0da97bb94 100644
--- a/templates/email/fixmystreet.com/cy/submit.html
+++ b/templates/email/fixmystreet.com/cy/submit.html
@@ -52,7 +52,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
         [% field.description OR field.name %]: [% field.value_label OR field.value %]
         [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/fixmystreet.com/cy/submit.txt b/templates/email/fixmystreet.com/cy/submit.txt
index 6e939960fa..e573fe2f54 100644
--- a/templates/email/fixmystreet.com/cy/submit.txt
+++ b/templates/email/fixmystreet.com/cy/submit.txt
@@ -25,7 +25,7 @@ Pwnc: [% report.title %]
 
 Manylion: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
index 155423a4a4..9a2e8170b0 100644
--- a/templates/email/fixmystreet.com/submit.html
+++ b/templates/email/fixmystreet.com/submit.html
@@ -54,7 +54,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
         <strong>[% field.description OR field.name %]:</strong> [% field.value_label OR field.value %]
         [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index 3be70f4e88..05b362515e 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -28,7 +28,7 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/highwaysengland/submit.html b/templates/email/highwaysengland/submit.html
index 8cd2ad4a33..31e30af5ca 100644
--- a/templates/email/highwaysengland/submit.html
+++ b/templates/email/highwaysengland/submit.html
@@ -57,7 +57,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     </p>
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
         <strong>[% field.description OR field.name %]:</strong> [% field.value_label OR field.value %]
         [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/highwaysengland/submit.txt b/templates/email/highwaysengland/submit.txt
index 5fc595b720..a457774855 100644
--- a/templates/email/highwaysengland/submit.txt
+++ b/templates/email/highwaysengland/submit.txt
@@ -29,7 +29,7 @@ Latitude: [% report.latitude %]
 
 Longitude: [% report.longitude %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]
diff --git a/templates/email/nottinghamshirepolice/submit.html b/templates/email/nottinghamshirepolice/submit.html
index 2df77ca4ef..08392c0e11 100644
--- a/templates/email/nottinghamshirepolice/submit.html
+++ b/templates/email/nottinghamshirepolice/submit.html
@@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
   [% IF report.get_extra_fields %]
     <p style="[% secondary_p_style %]">
-      [%~ FOR field IN report.get_extra_fields %][% IF field.value %]
+      [%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
       [% field.description OR field.name %]: [% field.value_label OR field.value %]
       [% IF NOT loop.last %]<br>[% END %]
       [%~ END %][% END %]
diff --git a/templates/email/nottinghamshirepolice/submit.txt b/templates/email/nottinghamshirepolice/submit.txt
index ccde78e4c6..dbf235591b 100644
--- a/templates/email/nottinghamshirepolice/submit.txt
+++ b/templates/email/nottinghamshirepolice/submit.txt
@@ -25,7 +25,7 @@ Subject: [% report.title %]
 
 Details: [% report.detail %]
 
-[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
+[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
 [% field.description OR field.name %]: [% field.value_label OR field.value %]
 
 [% END %][% END ~%]