diff --git a/library/includes/functions.php b/library/includes/functions.php
index 7d6c81763..714d3354a 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -787,7 +787,7 @@ function wbr($text, $max_word_length = HTML_WBR_LENGTH)
     return preg_replace("/([\w\->;:.,~!?(){}@#$%^*\/\\\\]{" . $max_word_length . "})/ui", '$1<wbr>', $text);
 }
 
-function generate_user_info($row, bool $group_mod = false): array
+function generate_user_info($row, bool $have_auth = IS_ADMIN): array
 {
     global $userdata, $lang, $images, $bb_cfg;
 
@@ -798,7 +798,7 @@ function generate_user_info($row, bool $group_mod = false): array
     $pm = $bb_cfg['text_buttons'] ? '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $lang['SEND_PM_TXTB'] . '</a>' : '<a href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
     $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), 50, 50);
 
-    if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod || ($row['user_id'] == $userdata['user_id'])) {
+    if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $have_auth || ($row['user_id'] == $userdata['user_id'])) {
         $email_uri = ($bb_cfg['board_email_form']) ? ("profile.php?mode=email&amp;" . POST_USERS_URL . "=" . $row['user_id']) : 'mailto:' . $row['user_email'];
         $email = '<a class="editable" href="' . $email_uri . '">' . $row['user_email'] . '</a>';
     } else {
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index edfc7e498..680d5c7a1 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -24,7 +24,7 @@
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">#</b></th>
 	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_USERNAME}</b></th>
 	<th class="{sorter: false}" ><b class="tbs-text">{L_PM}</b></th>
-	<!-- IF IS_ADMIN --><th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th><!-- ENDIF -->
+	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_EMAIL}</b></th>
 	<th class="{sorter: 'text'}" ><b class="tbs-text">{L_LOCATION}</b></th>
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_JOINED}</b></th>
 	<th class="{sorter: 'digit'}" ><b class="tbs-text">{L_POSTS_SHORT}</b></th>
@@ -41,7 +41,7 @@
 	<td>{memberrow.ROW_NUMBER}</td>
     <td><div>{memberrow.AVATAR}</div><b>{memberrow.USER}</b></td>
 	<td>{memberrow.PM}</td>
-	<!-- IF IS_ADMIN --><td>{memberrow.EMAIL}</td><!-- ENDIF -->
+	<td>{memberrow.EMAIL}</td>
 	<td>{memberrow.FROM}</td>
 	<td class="small">
 		<u>{memberrow.JOINED_RAW}</u>