diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index e8190b9d4..06a670266 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -456,7 +456,7 @@ if ($tor_reged && $tor_info) {
                     $tr[$x]++;
 
                     $peerUsername = $lang['HIDDEN_USER'];
-                    if (IS_AM || $peer['user_id'] == $userdata['user_id'] || !bf($peer['user_opt'], 'user_opt', 'user_hide_torrent_client')) {
+                    if (IS_AM || $peer['user_id'] == $userdata['user_id'] || !bf($peer['user_opt'], 'user_opt', 'user_hide_peer_username')) {
                         $releaserSign = (!$guest && $peer['releaser']) ? '&nbsp;<b><sup>&reg;</sup></b>' : '';
                         $peerUsername = profile_url($peer) . $releaserSign;
                         $peerUsername = $peer['update_time'] ? $peerUsername : "<s>$peerUsername</s>";
diff --git a/library/includes/functions.php b/library/includes/functions.php
index e490ad930..61954e856 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -198,7 +198,8 @@ $bf['user_opt'] = [
     'user_dls' => 14, // [SETTINGS] Hide list of "Current downloads" in my profile
     'user_retracker' => 15, // [SETTINGS] Add my retracker into downloaded torrent files
     'user_hide_torrent_client' => 16, // [SETTINGS] Option to hide user's torrent client in peer list
-    'user_hide_peer_country' => 17 // [SETTINGS] Option to hide user's country name in peer list
+    'user_hide_peer_country' => 17, // [SETTINGS] Option to hide user's country name in peer list
+    'user_hide_peer_username' => 18, // [SETTINGS] Option to hide peer username in peer list
 ];
 
 function bit2dec($bit_num)
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 69a14add1..5e101a310 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -367,6 +367,7 @@ foreach ($profile_fields as $field => $can_edit) {
                 'user_retracker' => $reg_mode ? true : true,
                 'user_hide_torrent_client' => $reg_mode ? true : true,
                 'user_hide_peer_country' => $reg_mode ? true : $bb_cfg['ip2country_settings']['enabled'],
+                'user_hide_peer_username' => $reg_mode ? false : true,
             ];
 
             foreach ($update_user_opt as $opt => $can_change_opt) {
diff --git a/library/language/source/main.php b/library/language/source/main.php
index 3f8da2cdc..09451df9b 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1881,6 +1881,7 @@ $lang['DL_UPD'] = 'upd: ';
 $lang['DL_INFO'] = 'shows data <i><b>only for the current session</b></i>';
 $lang['HIDE_PEER_TORRENT_CLIENT'] = 'Hide my BitTorrent client name in peer list';
 $lang['HIDE_PEER_COUNTRY_NAME'] = 'Hide my country name in peer list';
+$lang['HIDE_PEER_USERNAME'] = 'Hide my username in peer list';
 
 // Post PIN
 $lang['POST_PIN'] = 'Pin first post';
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
index 2a0e3fba5..4b800f172 100644
--- a/styles/templates/default/usercp_register.tpl
+++ b/styles/templates/default/usercp_register.tpl
@@ -335,6 +335,13 @@
             </td>
         </tr>
         <!-- ENDIF -->
+        <tr>
+            <td class="prof-title">{L_HIDE_PEER_USERNAME}:</td>
+            <td>
+                <label><input type="radio" name="user_hide_peer_username" value="1" <!-- IF USER_HIDE_PEER_USERNAME -->checked<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
+                <label><input type="radio" name="user_hide_peer_username" value="0" <!-- IF not USER_HIDE_PEER_USERNAME -->checked<!-- ENDIF --> />{L_NO}</label>
+            </td>
+        </tr>
         <tr>
             <th colspan="2">{L_AVATAR_PANEL}</th>
         </tr>