diff --git a/app/views/contact/new.html.slim b/app/views/contact/new.html.slim
index da45d29b6d9..c6b849d4861 100644
--- a/app/views/contact/new.html.slim
+++ b/app/views/contact/new.html.slim
@@ -3,19 +3,20 @@
 h1.h3.my0 = t('headings.contact')
 = simple_form_for(@contact_form, url: contact_path,
     html: { autocomplete: 'off', method: :post, role: 'form' }) do |f|
-  h4.mb-tiny = t('contact.intro')
-  hr.mt0.mb-12p
-  .mb3
-    .mb-tiny
-      = f.label :want_learn, class: 'checkbox'
-        = f.input :want_learn, as: :boolean, label: false, wrapper: false
-        span.indicator
-        = t('contact.learn_more', app: APP_NAME)
-    div
-      = f.label :want_tell, class: 'checkbox'
-        = f.input :want_tell, as: :boolean, label: false, wrapper: false
-        span.indicator
-        = t('contact.tell_experience', app: APP_NAME)
+  fieldset.m0.p0.border-none
+    legend.h4.mt0.mb-tiny.serif.bold = t('contact.intro')
+    hr.mt0.mb-12p
+    .mb3
+      .mb-tiny
+        = f.label :want_learn, class: 'checkbox'
+          = f.input :want_learn, as: :boolean, label: false, wrapper: false
+          span.indicator
+          = t('contact.learn_more', app: APP_NAME)
+      div
+        = f.label :want_tell, class: 'checkbox'
+          = f.input :want_tell, as: :boolean, label: false, wrapper: false
+          span.indicator
+          = t('contact.tell_experience', app: APP_NAME)
   = f.input :email_or_tel, as: 'string', required: true,
     label: t('contact.labels.email_or_tel')
   .mb3
diff --git a/app/views/user_mailer/contact_request.html.slim b/app/views/user_mailer/contact_request.html.slim
index f5e54f4fe87..a791e6d1279 100644
--- a/app/views/user_mailer/contact_request.html.slim
+++ b/app/views/user_mailer/contact_request.html.slim
@@ -4,14 +4,14 @@ div
 
 div
   strong.mr-tiny = t('user_mailer.contact_request.want_to_learn')
-  - if @details['want_learn']
+  - if @details['want_learn'] == '1'
     = t('user_mailer.contact_request.yes')
   - else
     = t('user_mailer.contact_request.no')
 
 div
   strong.mr-tiny = t('user_mailer.contact_request.talk_about_experience')
-  - if @details['want_tell']
+  - if @details['want_tell'] == '1'
     = t('user_mailer.contact_request.yes')
   - else
     = t('user_mailer.contact_request.no')
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 7a10a8fe1b4..dfa22009d60 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -91,6 +91,15 @@
         "#{t('user_mailer.contact_request.email_or_phone')}#{details['email_or_tel']}"
       )
 
+      expect(mail.html_part.body).to have_content(
+        "#{t('user_mailer.contact_request.want_to_learn')}#{t('user_mailer.contact_request.yes')}"
+      )
+
+      expect(mail.html_part.body).to have_content(
+        "#{t('user_mailer.contact_request.talk_about_experience')}" \
+        "#{t('user_mailer.contact_request.no')}"
+      )
+
       expect(mail.html_part.body).to have_content(
         "#{t('user_mailer.contact_request.comments_header')}#{details['comments']}"
       )