diff --git a/inc/custom-comments.php b/inc/custom-comments.php
index ecdabd6..ce50ef1 100644
--- a/inc/custom-comments.php
+++ b/inc/custom-comments.php
@@ -21,14 +21,11 @@
 
     add_filter( 'comment_form_defaults', 'bootstrap3_comment_form' );
     function bootstrap3_comment_form( $args ) {
+    $req = get_option( 'require_name_email' );
     $args['comment_field'] = '<div class="form-group comment-form-comment">
-    <label for="comment">' . _x( 'Comment', 'noun', 'understrap' ) . ( ' <span class="required">*</span>' : '' ) . '</label>
+    <label for="comment">' . _x( 'Comment', 'noun', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label>
     <textarea class="form-control" id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>
     </div>';
+    $args['class_submit'] = 'btn btn-default'; // since WP 4.1
     return $args;
     }
-    
-    add_action('comment_form', 'bootstrap3_comment_button' );
-    function bootstrap3_comment_button() {
-        echo '<button class="btn btn-default" type="submit">' . __( 'Submit' ) . '</button>';
-    }