diff --git a/modules/comment/comment-node-form.js b/modules/comment/comment-node-form.js
index 76db240..75c5675 100644
--- a/modules/comment/comment-node-form.js
+++ b/modules/comment/comment-node-form.js
@@ -12,7 +12,7 @@ Drupal.behaviors.commentFieldsetSummaries = {
       var vals = [];
 
       // Default comment setting.
-      vals.push($(".form-item-comment select option:selected", context).text());
+      vals.push($(".form-item-comment input:checked").parent().find('label').text());
 
       // Threading.
       var threading = $(".form-item-comment-default-mode input:checked", context).next('label').text();
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 37a208f..37c00df 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1128,14 +1128,25 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
     // as defaults to all new nodes. Therefore, it would be wrong to use #states
     // to hide the other settings based on the primary comment setting.
     $form['comment']['comment'] = array(
-      '#type' => 'select',
+      '#type' => 'radios',
       '#title' => t('Default comment setting for new content'),
       '#default_value' => variable_get('comment_' . $form['#node_type']->type, COMMENT_NODE_OPEN),
       '#options' => array(
         COMMENT_NODE_OPEN => t('Open'),
         COMMENT_NODE_CLOSED => t('Closed'),
-        COMMENT_NODE_HIDDEN => t('Hidden'),
       ),
+      '#description' => t('If <em>Open</em>, only users with the <em>Post comments</em> permission can posts comments.'),
+    );
+    $form['comment']['comment_anonymous'] = array(
+      '#type' => 'radios',
+      '#title' => t('Anonymous contact information'),
+      '#default_value' => variable_get('comment_anonymous_' . $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
+      '#options' => array(
+        COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Disabled'),
+        COMMENT_ANONYMOUS_MAY_CONTACT => t('Optional'),
+        COMMENT_ANONYMOUS_MUST_CONTACT => t('Required'),
+      ),
+      '#access' => user_access('post comments', drupal_anonymous_user()),
     );
     $form['comment']['comment_default_mode'] = array(
       '#type' => 'checkbox',
@@ -1149,17 +1160,6 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
       '#default_value' => variable_get('comment_default_per_page_' . $form['#node_type']->type, 50),
       '#options' => _comment_per_page(),
     );
-    $form['comment']['comment_anonymous'] = array(
-      '#type' => 'select',
-      '#title' => t('Anonymous commenting'),
-      '#default_value' => variable_get('comment_anonymous_' . $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
-      '#options' => array(
-        COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
-        COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
-        COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'),
-      ),
-      '#access' => user_access('post comments', drupal_anonymous_user()),
-    );
     $form['comment']['comment_subject_field'] = array(
       '#type' => 'checkbox',
       '#title' => t('Allow comment title'),
@@ -1217,7 +1217,7 @@ function comment_form_node_form_alter(&$form, $form_state) {
       COMMENT_NODE_HIDDEN => t('Hidden'),
     ),
     COMMENT_NODE_OPEN => array(
-      '#description' => t('Users with the "Post comments" permission can post comments.'),
+      '#description' => t('Users with the <em>Post comments</em> permission can post comments.'),
     ),
     COMMENT_NODE_CLOSED => array(
       '#description' => t('Users cannot post comments, but existing comments will be displayed.'),