diff --git a/core/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc
index 7b1c90b1a525b35023eb860554b74fd50306b100..f6835f9c3ce7136d4c9e0220158c9644fc156a4f 100644
--- a/core/modules/contact/contact.admin.inc
+++ b/core/modules/contact/contact.admin.inc
@@ -112,14 +112,9 @@ function contact_category_edit_form($form, &$form_state, array $category = array
     '#description' => t('When listing categories, those with lighter (smaller) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'),
   );
   $form['selected'] = array(
-    '#type' => 'select',
-    '#title' => t('Selected'),
-    '#options' => array(
-      0 => t('No'),
-      1 => t('Yes'),
-    ),
+    '#type' => 'checkbox',
+    '#title' => t('Make this the default category.'),
     '#default_value' => $category['selected'],
-    '#description' => t('Set this to <em>Yes</em> if you would like this category to be selected by default.'),
   );
   $form['cid'] = array(
     '#type' => 'value',
diff --git a/core/modules/contact/contact.test b/core/modules/contact/contact.test
index c80f21dadb1da836bf43aae4d9babd006b33f5c9..3c7f61af257eca64568978999ad3dd30e29c4167 100644
--- a/core/modules/contact/contact.test
+++ b/core/modules/contact/contact.test
@@ -221,7 +221,7 @@ class ContactSitewideTestCase extends WebTestBase {
     $edit['category'] = $category;
     $edit['recipients'] = $recipients;
     $edit['reply'] = $reply;
-    $edit['selected'] = ($selected ? '1' : '0');
+    $edit['selected'] = ($selected ? TRUE : FALSE);
     $this->drupalPost('admin/structure/contact/add', $edit, t('Save'));
   }
 
@@ -244,7 +244,7 @@ class ContactSitewideTestCase extends WebTestBase {
     $edit['category'] = $category;
     $edit['recipients'] = $recipients;
     $edit['reply'] = $reply;
-    $edit['selected'] = ($selected ? '1' : '0');
+    $edit['selected'] = ($selected ? TRUE : FALSE);
     $this->drupalPost('admin/structure/contact/edit/' . $category_id, $edit, t('Save'));
     return ($category_id);
   }
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index eb7c5a318404c97686158bee9ce426503d6624e7..db0f09f10f439f0b879fbd64d8248883b0de1a68 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -1177,9 +1177,9 @@ protected function drupalGetAJAX($path, array $options = array(), array $headers
    * @param  $edit
    *   Field data in an associative array. Changes the current input fields
    *   (where possible) to the values indicated. A checkbox can be set to
-   *   TRUE to be checked and FALSE to be unchecked. Note that when a form
-   *   contains file upload fields, other fields cannot start with the '@'
-   *   character.
+   *   TRUE to be checked and should be set to FALSE to be unchecked. Note that
+   *   when a form contains file upload fields, other fields cannot start with
+   *   the '@' character.
    *
    *   Multiple select fields can be set using name[] and setting each of the
    *   possible values. Example: