diff --git a/common/php/class-module.php b/common/php/class-module.php
index 468adbc03..95842ab5d 100644
--- a/common/php/class-module.php
+++ b/common/php/class-module.php
@@ -504,7 +504,7 @@ function users_select_form( $selected = null, $args = null ) {
 
 							<span class="ef-user_displayname"><?php echo esc_html( $user->display_name ); ?></span>
 
-							<?php if ( apply_filters( 'ef_users_select_form_show_email_address', true, $user ) ) : ?>
+							<?php if ( apply_filters( 'ef_display_user_email_address', true, $user->ID ) ) : ?>
 								<span class="ef-user_useremail"><?php echo esc_html( $user->user_email ); ?></span>
 							<?php endif; ?>
 						</label>
diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
index 6f7d488b8..f9fe1dd1c 100644
--- a/modules/editorial-comments/editorial-comments.php
+++ b/modules/editorial-comments/editorial-comments.php
@@ -286,6 +286,10 @@ function the_comment($comment, $args, $depth) {
 			}
 		}
 
+		$escaped_comment_author = esc_html( $comment->comment_author );
+		if ( apply_filters( 'ef_display_user_email_address', true, $comment->user_id ) ) {
+			$escaped_comment_author = comment_author_email_link( $comment->comment_author );
+		}
 	?>
 
 		<li id="comment-<?php echo esc_attr( $comment->comment_ID ); ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>>
@@ -295,7 +299,7 @@ function the_comment($comment, $args, $depth) {
 			<div class="post-comment-wrap">
 				<h5 class="comment-meta">
 					<?php printf( __('<span class="comment-author">%1$s</span><span class="meta"> said on %2$s at %3$s</span>', 'edit-flow'),
-							esc_html( $comment->comment_author ),
+							$escaped_comment_author,
 							get_comment_date( get_option( 'date_format' ) ),
 							get_comment_time() ); ?>
 				</h5>