diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e0cd17..16740997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 **Merged pull requests:**
 
 - Release v2.1.5-2023.09 🎉
+- Maked configurable email visibility for everybody [\#291](https://github.com/torrentpier/torrentpier-lts/pull/291) ([belomaxorka](https://github.com/belomaxorka))
 - Corrected translations in topic templates [\#289](https://github.com/torrentpier/torrentpier-lts/pull/289) ([belomaxorka](https://github.com/belomaxorka))
 - ACP: Changed extensions sorting [\#288](https://github.com/torrentpier/torrentpier-lts/pull/288) ([belomaxorka](https://github.com/belomaxorka))
 - Fix $mail_to format (Adding missing ">" at end) [\#284](https://github.com/torrentpier/torrentpier-lts/pull/284) ([belomaxorka](https://github.com/belomaxorka), dchistyakov)
diff --git a/group.php b/group.php
index 56e58fbb..d77e75aa 100644
--- a/group.php
+++ b/group.php
@@ -14,7 +14,7 @@ $select_sort_mode = $select_sort_order = '';
 
 function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$pm, &$email, &$www, &$user_time, &$avatar)
 {
-	global $lang, $images, $bb_cfg;
+	global $lang, $images, $bb_cfg, $userdata;
 
 	$from      = (!empty($row['user_from'])) ? $row['user_from'] : $lang['NOSELECT'];
 	$joined    = bb_date($row['user_regdate'], $date_format);
@@ -23,7 +23,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
 	$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)
+	if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $row['user_id'] == $userdata['user_id'] || $group_mod)
 	{
 		$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>';
diff --git a/library/config.php b/library/config.php
index 717c4ade..40b4a9f7 100644
--- a/library/config.php
+++ b/library/config.php
@@ -308,6 +308,7 @@ $bb_cfg['topic_notify_enabled']    = true; // отправлять ли увед
 $bb_cfg['pm_notify_enabled']       = true; // отправлять ли уведомление на почту, если пришло личное письмо на сайте
 $bb_cfg['group_send_email']        = true; // отправлять ли уведомление на почту, если пользователя приняли в группу, пригласили в группу
 $bb_cfg['email_change_disabled']   = false; // отключить возможность изменять почту самим пользователям
+$bb_cfg['show_email_visibility_settings'] = true; // разрешать ли пользователям изменять свои настройки отображения почты (Скрыто или нет)
 
 $bb_cfg['tech_admin_email']        = "admin@$domain_name"; // почта технической поддержки (тех. админа / создателя)
 $bb_cfg['abuse_email']             = "abuse@$domain_name"; // почта для жалоб (абуз, правообладатели)
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 415591b6..45101d23 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -374,7 +374,7 @@ foreach ($profile_fields as $field => $can_edit)
 
 			$update_user_opt = array(
 			#	'user_opt_name'  => ($reg_mode) ? #reg_value : #in_login_change
-				'user_viewemail'      => ($reg_mode) ? false : true,
+				'user_viewemail'      => ($reg_mode) ? false : (IS_ADMIN || $bb_cfg['show_email_visibility_settings']),
 				'user_viewonline'     => ($reg_mode) ? false : true,
 				'user_notify'         => ($reg_mode) ? true  : true,
 				'user_notify_pm'      => ($reg_mode) ? true  : true,
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
index 47e540d4..5e369cf7 100644
--- a/styles/templates/default/usercp_register.tpl
+++ b/styles/templates/default/usercp_register.tpl
@@ -196,7 +196,7 @@ ajax.callback.posts = function(data){
 	<!-- ENDIF -->
 </tr>
 
-<!-- IF IS_ADMIN -->
+<!-- IF IS_ADMIN || $bb_cfg['show_email_visibility_settings'] -->
 <tr>
 	<td class="prof-title">{L_PUBLIC_VIEW_EMAIL}:</td>
 	<td>